June 2024 - Wine-commits - list.winehq.org

Rémi Bernon : winex11: Force thread DPI awareness when calling NtUserRedrawWindow.
by Alexandre Julliard 11 Jun '24

11 Jun '24

Module: wine Branch: master Commit: 949920810a173a650305cbe3183151416c03c717 URL: https://gitlab.winehq.org/wine/wine/-/commit/949920810a173a650305cbe3183151… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 10 11:19:15 2024 +0200 winex11: Force thread DPI awareness when calling NtUserRedrawWindow. --- dlls/winex11.drv/event.c | 2 +- dlls/winex11.drv/window.c | 5 ++--- dlls/winex11.drv/x11drv.h | 9 +++++++++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 7adb083134c..a0b46fe1fd9 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -931,7 +931,7 @@ static BOOL X11DRV_Expose( HWND hwnd, XEvent *xev ) release_win_data( data ); - if (flags) NtUserRedrawWindow( hwnd, &rect, surface_region, flags ); + if (flags) redraw_window( hwnd, &rect, surface_region, flags ); if (surface_region) NtGdiDeleteObjectApp( surface_region ); return TRUE; } diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 39a8d2a4b5d..845cd896bb0 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1551,10 +1551,9 @@ static void move_window_bits( HWND hwnd, Window window, const RECT *old_rect, co /* map region to client rect since we are using DCX_WINDOW */ NtGdiOffsetRgn( rgn, new_window_rect->left - new_client_rect->left, new_window_rect->top - new_client_rect->top ); - NtUserRedrawWindow( hwnd, NULL, rgn, - RDW_INVALIDATE | RDW_FRAME | RDW_ERASE | RDW_ALLCHILDREN ); + redraw_window( hwnd, NULL, rgn, RDW_INVALIDATE | RDW_FRAME | RDW_ERASE | RDW_ALLCHILDREN ); } - else NtUserRedrawWindow( hwnd, NULL, rgn, RDW_INVALIDATE | RDW_ERASE | RDW_ALLCHILDREN ); + else redraw_window( hwnd, NULL, rgn, RDW_INVALIDATE | RDW_ERASE | RDW_ALLCHILDREN ); NtGdiDeleteObjectApp( rgn ); } } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 055b1a9be8b..3485d239fa2 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -894,6 +894,15 @@ static inline BOOL set_window_pos( HWND hwnd, HWND after, INT x, INT y, INT cx, return ret; } +/* per-monitor DPI aware NtUserRedrawWindow call */ +static inline BOOL redraw_window( HWND hwnd, const RECT *rect, HRGN hrgn, UINT flags ) +{ + UINT context = NtUserSetThreadDpiAwarenessContext( NTUSER_DPI_PER_MONITOR_AWARE_V2 ); + BOOL ret = NtUserRedrawWindow( hwnd, rect, hrgn, flags ); + NtUserSetThreadDpiAwarenessContext( context ); + return ret; +} + static inline HWND get_focus(void) { GUITHREADINFO info;

1 0

Rémi Bernon : winex11: Force thread DPI awareness when calling NtUserChildWindowFromPointEx.
by Alexandre Julliard 11 Jun '24

11 Jun '24

Module: wine Branch: master Commit: 0bc571657e63b478fb5913b90343a8ec39443b82 URL: https://gitlab.winehq.org/wine/wine/-/commit/0bc571657e63b478fb5913b90343a8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 10 11:36:12 2024 +0200 winex11: Force thread DPI awareness when calling NtUserChildWindowFromPointEx. --- dlls/winex11.drv/event.c | 3 +-- dlls/winex11.drv/x11drv.h | 9 +++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index a0b46fe1fd9..c377bbc9984 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -1423,8 +1423,7 @@ static HWND find_drop_window( HWND hQueryWnd, LPPOINT lpPt ) if (PtInRect( &tempRect, pt)) { - HWND ret = NtUserChildWindowFromPointEx( hQueryWnd, pt.x, pt.y, - CWP_SKIPINVISIBLE|CWP_SKIPDISABLED ); + HWND ret = child_window_from_point( hQueryWnd, pt.x, pt.y, CWP_SKIPINVISIBLE | CWP_SKIPDISABLED ); if (ret && ret != hQueryWnd) { ret = find_drop_window( ret, lpPt ); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 3485d239fa2..6d257a2afbd 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -903,6 +903,15 @@ static inline BOOL redraw_window( HWND hwnd, const RECT *rect, HRGN hrgn, UINT f return ret; } +/* per-monitor DPI aware NtUserChildWindowFromPointEx call */ +static inline HWND child_window_from_point( HWND parent, LONG x, LONG y, UINT flags ) +{ + UINT context = NtUserSetThreadDpiAwarenessContext( NTUSER_DPI_PER_MONITOR_AWARE_V2 ); + HWND ret = NtUserChildWindowFromPointEx( parent, x, y, flags ); + NtUserSetThreadDpiAwarenessContext( context ); + return ret; +} + static inline HWND get_focus(void) { GUITHREADINFO info;

1 0

Hans Leidekker : odbc32: Use a fixed size buffer for parameter bindings.
by Alexandre Julliard 11 Jun '24

11 Jun '24

Module: wine Branch: master Commit: d37bb6188f275240c71551b14d8ab6cd53e32cdb URL: https://gitlab.winehq.org/wine/wine/-/commit/d37bb6188f275240c71551b14d8ab6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 21 10:15:15 2024 +0200 odbc32: Use a fixed size buffer for parameter bindings. --- dlls/odbc32/proxyodbc.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index a3732c001be..85d18d94139 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -187,15 +187,16 @@ static const char *debugstr_sqllen( SQLLEN len ) #endif } -static BOOL resize_binding( struct param_binding *binding, UINT32 count ) +#define MAX_BINDING_PARAMS 1024 +static BOOL alloc_binding( struct param_binding *binding, UINT32 count ) { - struct param *tmp; - UINT32 new_count = max( binding->count, count ); - - if (!(tmp = realloc( binding->param, new_count * sizeof(*tmp) ))) return FALSE; - memset( tmp + binding->count, 0, (new_count - binding->count) * sizeof(*tmp) ); - binding->param = tmp; - binding->count = new_count; + if (count > MAX_BINDING_PARAMS) + { + FIXME( "increase maximum number of parameters\n" ); + return FALSE; + } + binding->count = count; + if (binding->param || (binding->param = calloc( MAX_BINDING_PARAMS, sizeof(*binding->param)))) return TRUE; return TRUE; } @@ -219,7 +220,7 @@ SQLRETURN WINAPI SQLBindCol(SQLHSTMT StatementHandle, SQLUSMALLINT ColumnNumber, FIXME( "column 0 not handled\n" ); return SQL_ERROR; } - if (!resize_binding( &handle->bind_col, ColumnNumber )) return SQL_ERROR; + if (!alloc_binding( &handle->bind_col, ColumnNumber )) return SQL_ERROR; params.StatementHandle = handle->unix_handle; params.StrLen_or_Ind = &handle->bind_col.param[i].len; if (SUCCESS(( ret = ODBC_CALL( SQLBindCol, &params )))) handle->bind_col.param[i].ptr = StrLen_or_Ind; @@ -259,7 +260,7 @@ SQLRETURN WINAPI SQLBindParam(SQLHSTMT StatementHandle, SQLUSMALLINT ParameterNu FIXME( "parameter 0 not handled\n" ); return SQL_ERROR; } - if (!resize_binding( &handle->bind_param, ParameterNumber )) return SQL_ERROR; + if (!alloc_binding( &handle->bind_param, ParameterNumber )) return SQL_ERROR; params.StatementHandle = handle->unix_handle; params.StrLen_or_Ind = &handle->bind_param.param[i].len; @@ -1884,7 +1885,7 @@ SQLRETURN WINAPI SQLBindParameter(SQLHSTMT StatementHandle, SQLUSMALLINT Paramet FIXME( "parameter 0 not handled\n" ); return SQL_ERROR; } - if (!resize_binding( &handle->bind_parameter, ParameterNumber )) return SQL_ERROR; + if (!alloc_binding( &handle->bind_parameter, ParameterNumber )) return SQL_ERROR; params.StatementHandle = handle->unix_handle; params.StrLen_or_Ind = &handle->bind_parameter.param[i].len;

1 0

Hans Leidekker : odbc32: Support SQLSetStmtAttr(SQL_ATTR_ROW_ARRAY_SIZE).
by Alexandre Julliard 11 Jun '24

11 Jun '24

Module: wine Branch: master Commit: f6d7bcaa6386d57cb120ae08e1f67be5ae224008 URL: https://gitlab.winehq.org/wine/wine/-/commit/f6d7bcaa6386d57cb120ae08e1f67b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 22 15:04:43 2024 +0200 odbc32: Support SQLSetStmtAttr(SQL_ATTR_ROW_ARRAY_SIZE). --- dlls/odbc32/proxyodbc.c | 142 ++++++++++++++++++++++++++++++++++++++---------- dlls/odbc32/unixlib.c | 6 +- dlls/odbc32/unixlib.h | 11 ++-- 3 files changed, 121 insertions(+), 38 deletions(-)

1 0

Hans Leidekker : odbc32: Turn SUCCESS() into a static inline function.
by Alexandre Julliard 11 Jun '24

11 Jun '24

Module: wine Branch: master Commit: ba6a1cff95e3db61fbb545d2f865c3001130ef68 URL: https://gitlab.winehq.org/wine/wine/-/commit/ba6a1cff95e3db61fbb545d2f865c3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 10 16:33:53 2024 +0200 odbc32: Turn SUCCESS() into a static inline function. --- dlls/odbc32/unixlib.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/odbc32/unixlib.h b/dlls/odbc32/unixlib.h index 87ee271904f..c021eb22c50 100644 --- a/dlls/odbc32/unixlib.h +++ b/dlls/odbc32/unixlib.h @@ -29,7 +29,7 @@ #include "winbase.h" #include "wine/unixlib.h" -#define SUCCESS(ret) (ret == SQL_SUCCESS || ret == SQL_SUCCESS_WITH_INFO) +static inline BOOL SUCCESS( SQLRETURN ret ) { return ret == SQL_SUCCESS || ret == SQL_SUCCESS_WITH_INFO; } enum sql_funcs {

1 0

Hans Leidekker : odbc32/tests: Add tests for fetching multiple rows at once and parameter binding.
by Alexandre Julliard 11 Jun '24

11 Jun '24

Module: wine Branch: master Commit: a1a0a0a2b51eefc6228fe9ade3d1a49ef005fa9d URL: https://gitlab.winehq.org/wine/wine/-/commit/a1a0a0a2b51eefc6228fe9ade3d1a4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 31 10:31:12 2024 +0200 odbc32/tests: Add tests for fetching multiple rows at once and parameter binding. --- dlls/odbc32/tests/odbc32.c | 123 +++++++++++++++++++++++++++++++++++++++------ 1 file changed, 107 insertions(+), 16 deletions(-) diff --git a/dlls/odbc32/tests/odbc32.c b/dlls/odbc32/tests/odbc32.c index 8a744f23834..57bb17ef617 100644 --- a/dlls/odbc32/tests/odbc32.c +++ b/dlls/odbc32/tests/odbc32.c @@ -198,8 +198,9 @@ static void test_SQLExecDirect( void ) SQLHDBC con; SQLHSTMT stmt; SQLRETURN ret; - SQLLEN count, len_id, len_name; - SQLINTEGER id; + SQLLEN count, len_id[2], len_name[2]; + SQLULEN rows_fetched; + SQLINTEGER id[2]; SQLCHAR name[32]; ret = SQLAllocEnv( &env ); @@ -232,6 +233,11 @@ static void test_SQLExecDirect( void ) ok( ret == SQL_SUCCESS, "got %d\n", ret ); if (ret == SQL_ERROR) diag( stmt, SQL_HANDLE_STMT ); + ret = SQLExecDirect( stmt, (SQLCHAR *)"INSERT INTO winetest VALUES (1, 'Mary')", + ARRAYSIZE("INSERT INTO winetest VALUES (1, 'Mary')") - 1 ); + ok( ret == SQL_SUCCESS, "got %d\n", ret ); + if (ret == SQL_ERROR) diag( stmt, SQL_HANDLE_STMT ); + ret = SQLExecDirect( stmt, (SQLCHAR *)"SELECT * FROM winetest", ARRAYSIZE("SELECT * FROM winetest") - 1 ); ok( ret == SQL_SUCCESS, "got %d\n", ret ); if (ret == SQL_ERROR) diag( stmt, SQL_HANDLE_STMT ); @@ -239,17 +245,17 @@ static void test_SQLExecDirect( void ) count = 0xdeadbeef; ret = SQLRowCount( stmt, &count ); ok( ret == SQL_SUCCESS, "got %d\n", ret ); - ok( count != 0xdeadbeef, "got %d\n", (int)count ); + ok( count == 2, "got %d\n", (int)count ); ret = SQLFetch( stmt ); ok( ret == SQL_SUCCESS, "got %d\n", ret ); - id = -1; - len_id = 0; - ret = SQLGetData( stmt, 1, SQL_C_SLONG, &id, sizeof(id), &len_id ); + id[0] = -1; + len_id[0] = 0; + ret = SQLGetData( stmt, 1, SQL_C_SLONG, id, sizeof(id[0]), len_id ); ok( ret == SQL_SUCCESS, "got %d\n", ret ); - ok( !id, "id not set\n" ); - ok( len_id == sizeof(id), "got %d\n", (int)len_id ); + ok( !id[0], "id not set\n" ); + ok( len_id[0] == sizeof(id[0]), "got %d\n", (int)len_id[0] ); ret = SQLFreeStmt( stmt, 0 ); ok( ret == SQL_SUCCESS, "got %d\n", ret ); @@ -261,25 +267,110 @@ static void test_SQLExecDirect( void ) ok( ret == SQL_SUCCESS, "got %d\n", ret ); if (ret == SQL_ERROR) diag( stmt, SQL_HANDLE_STMT ); - id = -1; - len_id = 0; - ret = SQLBindCol( stmt, 1, SQL_C_SLONG, &id, sizeof(id), &len_id ); + ret = SQLSetStmtAttr( stmt, SQL_ATTR_ROW_ARRAY_SIZE, (SQLPOINTER)2, 0 ); + ok( ret == SQL_SUCCESS, "got %d\n", ret ); + if (ret == SQL_ERROR) diag( stmt, SQL_HANDLE_STMT ); + + rows_fetched = 0xdeadbeef; + ret = SQLSetStmtAttr( stmt, SQL_ATTR_ROWS_FETCHED_PTR, (SQLPOINTER)&rows_fetched, 0 ); + ok( ret == SQL_SUCCESS, "got %d\n", ret ); + if (ret == SQL_ERROR) diag( stmt, SQL_HANDLE_STMT ); + + id[0] = -1; + id[1] = -1; + len_id[0] = 0; + len_id[1] = 0; + ret = SQLBindCol( stmt, 1, SQL_C_SLONG, id, sizeof(id), len_id ); ok( ret == SQL_SUCCESS, "got %d\n", ret ); if (ret == SQL_ERROR) diag( stmt, SQL_HANDLE_STMT ); memset( name, 0, sizeof(name) ); - len_name = 0; - ret = SQLBindCol( stmt, 2, SQL_C_CHAR, name, sizeof(name), &len_name ); + len_name[0] = 0; + len_name[1] = 0; + ret = SQLBindCol( stmt, 2, SQL_C_CHAR, name, sizeof(name), len_name ); ok( ret == SQL_SUCCESS, "got %d\n", ret ); if (ret == SQL_ERROR) diag( stmt, SQL_HANDLE_STMT ); ret = SQLFetch( stmt ); ok( ret == SQL_SUCCESS, "got %d\n", ret ); - ok( !id, "id not set\n" ); - ok( len_id == sizeof(id), "got %d\n", (int)len_id ); + ok( rows_fetched == 2, "got %d\n", (int)rows_fetched ); + ok( id[0] == 0, "got %d\n", id[0] ); + ok( id[1] == 1, "got %d\n", id[1] ); + ok( len_id[0] == sizeof(id[0]), "got %d\n", (int)len_id[0] ); + ok( len_id[1] == sizeof(id[1]), "got %d\n", (int)len_id[1] ); ok( !strcmp( (const char *)name, "John" ), "got %s\n", name ); - ok( len_name == sizeof("John") - 1, "got %d\n", (int)len_name ); + ok( len_name[0] == sizeof("John") - 1, "got %d\n", (int)len_name[0] ); + ok( len_name[1] == sizeof("Mary") - 1, "got %d\n", (int)len_name[1] ); + + ret = SQLFreeStmt( stmt, 0 ); + ok( ret == SQL_SUCCESS, "got %d\n", ret ); + + ret = SQLAllocStmt( con, &stmt ); + ok( ret == SQL_SUCCESS, "got %d\n", ret ); + + ret = SQLPrepare( stmt, (SQLCHAR *)"SELECT * FROM winetest WHERE Id = ? AND Name = ?", + ARRAYSIZE("SELECT * FROM winetest WHERE Id = ? AND Name = ?") - 1 ); + ok( ret == SQL_SUCCESS, "got %d\n", ret ); + if (ret == SQL_ERROR) diag( stmt, SQL_HANDLE_STMT ); + + id[0] = 1; + len_id[0] = sizeof(id[0]); + ret = SQLBindParam( stmt, 1, SQL_INTEGER, SQL_INTEGER, 0, 0, id, len_id ); + ok( ret == SQL_SUCCESS, "got %d\n", ret ); + if (ret == SQL_ERROR) diag( stmt, SQL_HANDLE_STMT ); + + memcpy( name, "Mary", sizeof("Mary") ); + len_name[0] = sizeof( "Mary" ) - 1; + ret = SQLBindParam( stmt, 2, SQL_CHAR, SQL_VARCHAR, 0, 0, name, len_name ); + ok( ret == SQL_SUCCESS, "got %d\n", ret ); + if (ret == SQL_ERROR) diag( stmt, SQL_HANDLE_STMT ); + + ret = SQLExecute( stmt ); + ok( ret == SQL_SUCCESS, "got %d\n", ret ); + if (ret == SQL_ERROR) diag( stmt, SQL_HANDLE_STMT ); + + ret = SQLFetch( stmt ); + ok( ret == SQL_SUCCESS, "got %d\n", ret ); + if (ret == SQL_ERROR) diag( stmt, SQL_HANDLE_STMT ); + ok( id[0] == 1, "got %d\n", id[0] ); + ok( len_id[0] == sizeof(id[0]), "got %d\n", (int)len_id[0] ); + ok( !strcmp( (const char *)name, "Mary" ), "got %s\n", name ); + ok( len_name[0] == sizeof("Mary") - 1, "got %d\n", (int)len_name[0] ); + + ret = SQLFreeStmt( stmt, 0 ); + ok( ret == SQL_SUCCESS, "got %d\n", ret ); + + ret = SQLAllocStmt( con, &stmt ); + ok( ret == SQL_SUCCESS, "got %d\n", ret ); + + ret = SQLPrepare( stmt, (SQLCHAR *)"SELECT * FROM winetest WHERE Id = ? AND Name = ?", + ARRAYSIZE("SELECT * FROM winetest WHERE Id = ? AND Name = ?") - 1 ); + ok( ret == SQL_SUCCESS, "got %d\n", ret ); + if (ret == SQL_ERROR) diag( stmt, SQL_HANDLE_STMT ); + + id[0] = 1; + len_id[0] = sizeof(id[0]); + ret = SQLBindParameter( stmt, 1, SQL_PARAM_INPUT, SQL_INTEGER, SQL_INTEGER, 0, 0, id, 0, len_id ); + ok( ret == SQL_SUCCESS, "got %d\n", ret ); + if (ret == SQL_ERROR) diag( stmt, SQL_HANDLE_STMT ); + + memcpy( name, "Mary", sizeof("Mary") ); + len_name[0] = sizeof( "Mary" ) - 1; + ret = SQLBindParameter( stmt, 2, SQL_PARAM_INPUT, SQL_CHAR, SQL_VARCHAR, 0, 0, name, 0, len_name ); + ok( ret == SQL_SUCCESS, "got %d\n", ret ); + if (ret == SQL_ERROR) diag( stmt, SQL_HANDLE_STMT ); + ret = SQLExecute( stmt ); + ok( ret == SQL_SUCCESS, "got %d\n", ret ); + if (ret == SQL_ERROR) diag( stmt, SQL_HANDLE_STMT ); + + ret = SQLFetch( stmt ); + ok( ret == SQL_SUCCESS, "got %d\n", ret ); + if (ret == SQL_ERROR) diag( stmt, SQL_HANDLE_STMT ); + ok( id[0] == 1, "got %d\n", id[0] ); + ok( len_id[0] == sizeof(id[0]), "got %d\n", (int)len_id[0] ); + ok( !strcmp( (const char *)name, "Mary" ), "got %s\n", name ); + ok( len_name[0] == sizeof("Mary") - 1, "got %d\n", (int)len_name[0] ); ret = SQLFreeStmt( stmt, SQL_UNBIND ); ok( ret == SQL_SUCCESS, "got %d\n", ret );

1 0

Alexandre Julliard : ntdll: Look for hybrid builtins in the PE directory for the host architecture.
by Alexandre Julliard 11 Jun '24

11 Jun '24

Module: wine Branch: master Commit: d5a499e552d0f2c75922ae1089f7d2c78464d5ed URL: https://gitlab.winehq.org/wine/wine/-/commit/d5a499e552d0f2c75922ae1089f7d2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 11 10:29:19 2024 +0200 ntdll: Look for hybrid builtins in the PE directory for the host architecture. --- dlls/ntdll/unix/loader.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 9d866fa70f5..8cf6abed3da 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1283,6 +1283,7 @@ NTSTATUS load_builtin( const pe_image_info_t *image_info, WCHAR *filename, USHOR { NTSTATUS status; UNICODE_STRING nt_name; + USHORT search_machine = image_info->machine; enum loadorder loadorder; init_unicode_string( &nt_name, filename ); @@ -1302,6 +1303,9 @@ NTSTATUS load_builtin( const pe_image_info_t *image_info, WCHAR *filename, USHOR loadorder = LO_BUILTIN; /* builtin with no fallback since mapping a fake dll is not useful */ } + if (is_arm64ec() && image_info->is_hybrid && search_machine == IMAGE_FILE_MACHINE_AMD64) + search_machine = current_machine; + switch (loadorder) { case LO_NATIVE: @@ -1309,10 +1313,10 @@ NTSTATUS load_builtin( const pe_image_info_t *image_info, WCHAR *filename, USHOR return STATUS_IMAGE_ALREADY_LOADED; case LO_BUILTIN: return find_builtin_dll( &nt_name, module, size, info, limit_low, limit_high, - image_info->machine, machine, FALSE ); + search_machine, machine, FALSE ); default: status = find_builtin_dll( &nt_name, module, size, info, limit_low, limit_high, - image_info->machine, machine, (loadorder == LO_DEFAULT) ); + search_machine, machine, (loadorder == LO_DEFAULT) ); if (status == STATUS_DLL_NOT_FOUND || status == STATUS_NOT_SUPPORTED) return STATUS_IMAGE_ALREADY_LOADED; return status;

1 0

Alexandre Julliard : ntdll: Remove some unnecessary asm macros on ARM plaforms.
by Alexandre Julliard 11 Jun '24

11 Jun '24

Module: wine Branch: master Commit: edce2ef692077d68797a0a019ab9f77ff43975be URL: https://gitlab.winehq.org/wine/wine/-/commit/edce2ef692077d68797a0a019ab9f7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 11 10:30:19 2024 +0200 ntdll: Remove some unnecessary asm macros on ARM plaforms. --- dlls/ntdll/relay.c | 20 ++------------------ dlls/ntdll/signal_arm.c | 32 +++++++++++++++----------------- dlls/ntdll/signal_arm64.c | 36 +++++++++++++++++++----------------- dlls/ntdll/signal_arm64ec.c | 2 +- dlls/ntdll/unix/signal_arm.c | 10 ---------- include/wine/asm.h | 6 +++--- 6 files changed, 40 insertions(+), 66 deletions(-)

1 0

Alexandre Julliard : winecrt0: Remove some unnecessary asm macros on ARM plaforms.
by Alexandre Julliard 11 Jun '24

11 Jun '24

Module: wine Branch: master Commit: a00b5abc303f0c262498da10ca09f10313a48347 URL: https://gitlab.winehq.org/wine/wine/-/commit/a00b5abc303f0c262498da10ca09f1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 11 10:31:12 2024 +0200 winecrt0: Remove some unnecessary asm macros on ARM plaforms. --- dlls/winecrt0/arm64ec.c | 12 ++++++------ dlls/winecrt0/setjmp.c | 12 ++++-------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/dlls/winecrt0/arm64ec.c b/dlls/winecrt0/arm64ec.c index 38903ac17f0..65b8df4de24 100644 --- a/dlls/winecrt0/arm64ec.c +++ b/dlls/winecrt0/arm64ec.c @@ -59,17 +59,17 @@ asm( ".section .data,\"drw\"\n" __ASM_GLOBAL_FUNC( __icall_helper_arm64ec, "stp fp, lr, [sp, #-0x10]!\n\t" - __ASM_SEH( ".seh_save_fplr_x 16\n\t" ) + ".seh_save_fplr_x 16\n\t" "mov fp, sp\n\t" - __ASM_SEH( ".seh_set_fp\n\t" ) - __ASM_SEH( ".seh_endprologue\n\t" ) + ".seh_set_fp\n\t" + ".seh_endprologue\n\t" "adrp x16, __os_arm64x_dispatch_icall\n\t" "ldr x16, [x16, #:lo12:__os_arm64x_dispatch_icall]\n\t" "blr x16\n\t" - __ASM_SEH( ".seh_startepilogue\n\t" ) + ".seh_startepilogue\n\t" "ldp fp, lr, [sp], #0x10\n\t" - __ASM_SEH( ".seh_save_fplr_x 0x10\n\t" ) - __ASM_SEH( ".seh_endepilogue\n\t" ) + ".seh_save_fplr_x 0x10\n\t" + ".seh_endepilogue\n\t" "br x11" ) asm( "\t.section .rdata,\"dr\"\n" diff --git a/dlls/winecrt0/setjmp.c b/dlls/winecrt0/setjmp.c index ebae94aa396..1d7a069a205 100644 --- a/dlls/winecrt0/setjmp.c +++ b/dlls/winecrt0/setjmp.c @@ -67,8 +67,8 @@ int __cdecl __attribute__((naked)) __wine_setjmpex( __wine_jmp_buf *buf, EXCEPTI "stp d10, d11, [x0, #0xa0]\n\t" /* jmp_buf->Xmm10,Xmm11 */ "stp d12, d13, [x0, #0xc0]\n\t" /* jmp_buf->Xmm12,Xmm13 */ "stp d14, d15, [x0, #0xe0]\n\t" /* jmp_buf->Xmm14,Xmm15 */ - "adrp x8, " __ASM_NAME("__os_arm64x_get_x64_information") "\n\t" - "ldr x8, [x8, :lo12:" __ASM_NAME("__os_arm64x_get_x64_information") "]\n\t" + "adrp x8, __os_arm64x_get_x64_information\n\t" + "ldr x8, [x8, :lo12:__os_arm64x_get_x64_information]\n\t" "add x1, x0, #0x58\n\t" /* jmp_buf->Mxcsr */ "mov x0, #0\n\t" "blr x8\n\t" @@ -81,8 +81,8 @@ void __cdecl __attribute__((naked)) __wine_longjmp( __wine_jmp_buf *buf, int ret { asm( "mov x19, x0\n\t" "mov x20, x1\n\t" - "adrp x8, " __ASM_NAME("__os_arm64x_set_x64_information") "\n\t" - "ldr x8, [x8, :lo12:" __ASM_NAME("__os_arm64x_set_x64_information") "]\n\t" + "adrp x8, __os_arm64x_set_x64_information\n\t" + "ldr x8, [x8, :lo12:__os_arm64x_set_x64_information]\n\t" "ldr w1, [x0, #0x58]\n\t" /* jmp_buf->Mxcsr */ "mov x0, #0\n\t" "blr x8\n\t" @@ -166,12 +166,10 @@ __ASM_GLOBAL_FUNC( __wine_setjmpex, "stm r0, {r1,r4-r11}\n" /* jmp_buf->Frame,R4..R11 */ "str sp, [r0, #0x24]\n\t" /* jmp_buf->Sp */ "str lr, [r0, #0x28]\n\t" /* jmp_buf->Pc */ -#ifndef __SOFTFP__ "vmrs r2, fpscr\n\t" "str r2, [r0, #0x2c]\n\t" /* jmp_buf->Fpscr */ "add r0, r0, #0x30\n\t" "vstm r0, {d8-d15}\n\t" /* jmp_buf->D[0..7] */ -#endif "mov r0, #0\n\t" "bx lr" ) @@ -179,12 +177,10 @@ __ASM_GLOBAL_FUNC( __wine_longjmp, "ldm r0, {r3-r11}\n\t" /* jmp_buf->Frame,R4..R11 */ "ldr sp, [r0, #0x24]\n\t" /* jmp_buf->Sp */ "ldr r2, [r0, #0x28]\n\t" /* jmp_buf->Pc */ -#ifndef __SOFTFP__ "ldr r3, [r0, #0x2c]\n\t" /* jmp_buf->Fpscr */ "vmsr fpscr, r3\n\t" "add r0, r0, #0x30\n\t" "vldm r0, {d8-d15}\n\t" /* jmp_buf->D[0..7] */ -#endif "mov r0, r1\n\t" /* retval */ "bx r2" )

1 0

Alexandre Julliard : makedep: Build and install ARM64EC-only modules.
by Alexandre Julliard 11 Jun '24

11 Jun '24

Module: wine Branch: master Commit: f84734fc3f47010d3a92d393b2d9cd746422c3e4 URL: https://gitlab.winehq.org/wine/wine/-/commit/f84734fc3f47010d3a92d393b2d9cd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 11 10:38:44 2024 +0200 makedep: Build and install ARM64EC-only modules. --- tools/makedep.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index f22552f8400..58b77a3fd43 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -597,9 +597,10 @@ static int is_native_arch_disabled( struct makefile *make ) /******************************************************************* * get_link_arch */ -static int get_link_arch( struct makefile *make, unsigned int arch, unsigned int *link_arch ) +static int get_link_arch( const struct makefile *make, unsigned int arch, unsigned int *link_arch ) { unsigned int hybrid_arch = hybrid_archs[arch]; + if (native_archs[arch]) return 0; if (hybrid_arch && make->disabled[hybrid_arch]) hybrid_arch = 0; if (make->disabled[arch] && !hybrid_arch) return 0; @@ -2287,9 +2288,9 @@ static struct strarray add_import_libs( const struct makefile *make, struct stra struct strarray imports, enum import_type type, unsigned int arch ) { struct strarray ret = empty_strarray; - unsigned int i; + unsigned int i, link_arch; - if (native_archs[arch]) arch = native_archs[arch]; + if (!get_link_arch( make, arch, &link_arch )) return ret; for (i = 0; i < imports.count; i++) { @@ -2310,7 +2311,7 @@ static struct strarray add_import_libs( const struct makefile *make, struct stra } else name = get_base_name( name ); - if ((submake = get_static_lib( name, arch ))) + if ((submake = get_static_lib( name, link_arch ))) { const char *ext = (type == IMPORT_TYPE_DELAYED && !delay_load_flags[arch]) ? ".delay.a" : ".a"; const char *lib = obj_dir_path( submake, strmake( "%slib%s%s", arch_dirs[arch], name, ext )); @@ -3389,8 +3390,6 @@ static void output_module( struct makefile *make, unsigned int arch ) char *spec_file = NULL; unsigned int i, link_arch; - if (!get_link_arch( make, arch, &link_arch )) return; - if (!make->is_exe) { if (make->data_only || strarray_exists( &make->extradllflags, "-Wl,--subsystem,native" )) @@ -3404,6 +3403,8 @@ static void output_module( struct makefile *make, unsigned int arch ) if (!make->data_only) { + if (!get_link_arch( make, arch, &link_arch )) return; + module_name = arch_module_name( make->module, arch ); if (!strarray_exists( &make->extradllflags, "-nodefaultlibs" )) default_imports = get_default_imports( make, imports ); @@ -3422,14 +3423,21 @@ static void output_module( struct makefile *make, unsigned int arch ) } } } - else module_name = strmake( "%s%s", arch_pe_dirs[arch], make->module ); + else + { + if (native_archs[arch]) return; + if (make->disabled[arch]) return; + link_arch = arch; + + module_name = strmake( "%s%s", arch_pe_dirs[arch], make->module ); + } - strarray_add( &make->all_targets[arch], module_name ); + strarray_add( &make->all_targets[link_arch], module_name ); if (make->data_only) - add_install_rule( make, make->module, arch, module_name, + add_install_rule( make, make->module, link_arch, module_name, strmake( "d$(dlldir)/%s%s", arch_pe_dirs[arch], make->module )); else - add_install_rule( make, make->module, arch, module_name, + add_install_rule( make, make->module, link_arch, module_name, strmake( "%c%s%s%s", '0' + arch, arch_install_dirs[arch], make->module, dll_ext[arch] ));

1 0