January 2024 - Wine-commits

Dmitry Timoshkov : ntdll: Add NtCompareTokens() stub.
by Alexandre Julliard 17 Jan '24

17 Jan '24

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

Brendan Shanks : opengl32: Make wglSwapLayerBuffers hookable.
by Alexandre Julliard 17 Jan '24

17 Jan '24

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

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

17 Jan '24

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

Bernhard Übelacker : wing32: Add tests.
by Alexandre Julliard 17 Jan '24

17 Jan '24

Module: wine Branch: master Commit: edf0635ed4350973924407c71b1dbfad2f9d2416 URL: https://gitlab.winehq.org/wine/wine/-/commit/edf0635ed4350973924407c71b1dbf… Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Sun Jan 14 10:20:16 2024 +0100 wing32: Add tests. --- configure | 1 + configure.ac | 1 + dlls/wing32/Makefile.in | 1 + dlls/wing32/tests/Makefile.in | 5 ++++ dlls/wing32/tests/wing32.c | 64 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 72 insertions(+) diff --git a/configure b/configure index e30aed5f408..3939f1873a4 100755 --- a/configure +++ b/configure @@ -22440,6 +22440,7 @@ wine_fn_config_makefile dlls/winex11.drv enable_winex11_drv wine_fn_config_makefile dlls/winexinput.sys enable_winexinput_sys wine_fn_config_makefile dlls/wing.dll16 enable_win16 wine_fn_config_makefile dlls/wing32 enable_wing32 +wine_fn_config_makefile dlls/wing32/tests enable_tests wine_fn_config_makefile dlls/winhttp enable_winhttp wine_fn_config_makefile dlls/winhttp/tests enable_tests wine_fn_config_makefile dlls/wininet enable_wininet diff --git a/configure.ac b/configure.ac index cba55126869..9488b3263cc 100644 --- a/configure.ac +++ b/configure.ac @@ -3257,6 +3257,7 @@ WINE_CONFIG_MAKEFILE(dlls/winex11.drv) WINE_CONFIG_MAKEFILE(dlls/winexinput.sys) WINE_CONFIG_MAKEFILE(dlls/wing.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/wing32) +WINE_CONFIG_MAKEFILE(dlls/wing32/tests) WINE_CONFIG_MAKEFILE(dlls/winhttp) WINE_CONFIG_MAKEFILE(dlls/winhttp/tests) WINE_CONFIG_MAKEFILE(dlls/wininet) diff --git a/dlls/wing32/Makefile.in b/dlls/wing32/Makefile.in index 833e62e8d8e..e4da7836632 100644 --- a/dlls/wing32/Makefile.in +++ b/dlls/wing32/Makefile.in @@ -1,4 +1,5 @@ MODULE = wing32.dll +IMPORTLIB = wing32 IMPORTS = user32 gdi32 SOURCES = \ diff --git a/dlls/wing32/tests/Makefile.in b/dlls/wing32/tests/Makefile.in new file mode 100644 index 00000000000..395a9f4706a --- /dev/null +++ b/dlls/wing32/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = wing32.dll +IMPORTS = wing32 gdi32 + +SOURCES = \ + wing32.c diff --git a/dlls/wing32/tests/wing32.c b/dlls/wing32/tests/wing32.c new file mode 100644 index 00000000000..1a3c958ff02 --- /dev/null +++ b/dlls/wing32/tests/wing32.c @@ -0,0 +1,64 @@ +/* + * Unit test suite for wing32 functions + * + * Copyright 2024 Bernhard Übelacker + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <windows.h> + +#include "wine/test.h" + +HDC WINAPI WinGCreateDC(void); +HBITMAP WINAPI WinGCreateBitmap(HDC, BITMAPINFO*, void **); +void* WINAPI WinGGetDIBPointer(HBITMAP, BITMAPINFO*); + +static void test_WinGGetDIBPointer(void) +{ + HDC dc; + BITMAPINFO bmi; + void *bits; + HBITMAP bmp; + void* dib; + + dc = WinGCreateDC(); + ok(dc != NULL, "WinGCreateDC failed\n"); + + memset(&bmi, 0, sizeof(bmi)); + bmi.bmiHeader.biSize = sizeof(bmi.bmiHeader); + bmi.bmiHeader.biWidth = 1; + bmi.bmiHeader.biHeight = 1; + bmi.bmiHeader.biPlanes = 1; + bmi.bmiHeader.biBitCount= 24; + bmi.bmiHeader.biCompression= BI_RGB; + bmi.bmiHeader.biSizeImage = 0; + bmp = WinGCreateBitmap(dc, &bmi, &bits); + ok(bmp != NULL, "WinGCreateBitmap failed\n"); + + dib = WinGGetDIBPointer(NULL, NULL); + ok(dib == NULL, "WinGGetDIBPointer returned unexpected value %p\n", dib); + + dib = WinGGetDIBPointer(bmp, &bmi); + ok(dib != NULL, "WinGGetDIBPointer failed\n"); + + DeleteObject(bmp); + DeleteDC(dc); +} + +START_TEST(wing32) +{ + test_WinGGetDIBPointer(); +}

1 0

Bernhard Übelacker : wing32: Avoid crash in WinGGetDIBPointer when called with NULL bitmap info.
by Alexandre Julliard 17 Jan '24

17 Jan '24

Module: wine Branch: master Commit: 0f6a66e91967cfd53f90975b172d8f06c31f8be1 URL: https://gitlab.winehq.org/wine/wine/-/commit/0f6a66e91967cfd53f90975b172d8f… Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Sun Jan 14 10:24:45 2024 +0100 wing32: Avoid crash in WinGGetDIBPointer when called with NULL bitmap info. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56135 --- dlls/wing32/tests/wing32.c | 3 +++ dlls/wing32/wing32.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wing32/tests/wing32.c b/dlls/wing32/tests/wing32.c index 1a3c958ff02..e3f01ff22bc 100644 --- a/dlls/wing32/tests/wing32.c +++ b/dlls/wing32/tests/wing32.c @@ -51,6 +51,9 @@ static void test_WinGGetDIBPointer(void) dib = WinGGetDIBPointer(NULL, NULL); ok(dib == NULL, "WinGGetDIBPointer returned unexpected value %p\n", dib); + dib = WinGGetDIBPointer(bmp, NULL); + ok(dib != NULL, "WinGGetDIBPointer failed\n"); + dib = WinGGetDIBPointer(bmp, &bmi); ok(dib != NULL, "WinGGetDIBPointer failed\n"); diff --git a/dlls/wing32/wing32.c b/dlls/wing32/wing32.c index b6702ba8017..14012206286 100644 --- a/dlls/wing32/wing32.c +++ b/dlls/wing32/wing32.c @@ -72,7 +72,7 @@ void * WINAPI WinGGetDIBPointer( HBITMAP hbmp, BITMAPINFO *bmi ) if (GetObjectW( hbmp, sizeof(ds), &ds ) == sizeof(ds)) { - bmi->bmiHeader = ds.dsBmih; + if (bmi) bmi->bmiHeader = ds.dsBmih; return ds.dsBm.bmBits; } return NULL;

1 0

Rémi Bernon : winex11: Return STATUS_NOT_FOUND when IME update isn't found.
by Alexandre Julliard 17 Jan '24

17 Jan '24

Module: wine Branch: master Commit: 59820f0efb0ecfc7e91270ad79424b87a2443dfa URL: https://gitlab.winehq.org/wine/wine/-/commit/59820f0efb0ecfc7e91270ad79424b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 10 21:03:48 2024 +0100 winex11: Return STATUS_NOT_FOUND when IME update isn't found. --- dlls/winex11.drv/xim.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index 209d63f0402..155cd13809e 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -555,7 +555,7 @@ UINT X11DRV_ImeToAsciiEx( UINT vkey, UINT lparam, const BYTE *state, COMPOSITION if (!(update = find_ime_update( lparam ))) { pthread_mutex_unlock( &ime_mutex ); - return 0; + return STATUS_NOT_FOUND; } if (!update->comp_str) comp_len = 0;

1 0

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

17 Jan '24

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

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

17 Jan '24

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

Zebediah Figura : ddraw: Use the sysmem wined3d texture for sysmem surfaces if possible.
by Alexandre Julliard 17 Jan '24

17 Jan '24

Module: wine Branch: master Commit: d6204ccd54fd2cb6404d86ce5d89ed92c856db0a URL: https://gitlab.winehq.org/wine/wine/-/commit/d6204ccd54fd2cb6404d86ce5d89ed… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 3 20:49:04 2024 -0600 ddraw: Use the sysmem wined3d texture for sysmem surfaces if possible. --- dlls/ddraw/ddraw_private.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index f40188f75ef..6fc93b91860 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -698,7 +698,8 @@ static inline struct wined3d_texture *ddraw_surface_get_draw_texture(struct ddra static inline struct wined3d_texture *ddraw_surface_get_any_texture(struct ddraw_surface *surface, unsigned int flags) { - if (surface->texture_location & DDRAW_SURFACE_LOCATION_DEFAULT) + if ((surface->texture_location & DDRAW_SURFACE_LOCATION_DEFAULT) + || (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY)) return ddraw_surface_get_default_texture(surface, flags); assert(surface->texture_location & DDRAW_SURFACE_LOCATION_DRAW);

1 0

Rémi Bernon : user32/tests: Add flaky_wine to some SetActiveWindow tests.
by Alexandre Julliard 17 Jan '24

17 Jan '24

Module: wine Branch: master Commit: 85dac24e64aaed972c031bef01da5308a7bd2b5c URL: https://gitlab.winehq.org/wine/wine/-/commit/85dac24e64aaed972c031bef01da53… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Jan 13 20:30:03 2024 +0100 user32/tests: Add flaky_wine to some SetActiveWindow tests. They are constantly failing on Gitlab, and may be caused various race conditions around window focus, both in Wine and in Fvwm. It would be nice to fix them but it's been going for many years now and unlikely to be the case soon. --- dlls/user32/tests/win.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 2fd31be3314..8dad718e357 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3814,10 +3814,13 @@ static void test_SetActiveWindow_0( char **argv ) flush_events( TRUE ); tmp = GetForegroundWindow(); + flaky_wine ok( tmp == hwnd, "GetForegroundWindow returned %p\n", tmp ); tmp = GetActiveWindow(); + flaky_wine ok( tmp == hwnd, "GetActiveWindow returned %p\n", tmp ); tmp = GetFocus(); + flaky_wine ok( tmp == hwnd, "GetFocus returned %p\n", tmp ); events[1] = CreateEventW( NULL, FALSE, FALSE, L"test_SetActiveWindow_0_start" );

1 0