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

Rémi Bernon : kernel32/tests: Break debugger loop on unexpected result.
by Alexandre Julliard June 18, 2024

June 18, 2024

Module: wine Branch: master Commit: 6cb63e996ee8495c9054499ead1d752ad1da9f6a URL: https://gitlab.winehq.org/wine/wine/-/commit/6cb63e996ee8495c9054499ead1d75… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jun 18 11:22:44 2024 +0200 kernel32/tests: Break debugger loop on unexpected result. Avoid infinite loop that sometimes happen on macOS and make the test spew hundred of thousand of "Test failed" lines. --- dlls/kernel32/tests/debugger.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 301714342e4..0782b8f21eb 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -2190,8 +2190,10 @@ static void test_debugger(const char *argv0) { next_event(&ctx, WAIT_EVENT_TIMEOUT); ok (ctx.ev.dwDebugEventCode != EXCEPTION_DEBUG_EVENT, "got exception\n"); + if (ctx.ev.dwDebugEventCode == EXCEPTION_DEBUG_EVENT) break; } while (ctx.ev.dwDebugEventCode != EXIT_PROCESS_DEBUG_EVENT); + if (ctx.ev.dwDebugEventCode != EXIT_PROCESS_DEBUG_EVENT) TerminateProcess(pi.hProcess, 0); ret = CloseHandle(event); ok(ret, "CloseHandle failed, last error %ld.\n", GetLastError());

1 0

Rémi Bernon : dwrite/tests: Ignore macOS specific "flip" sbix format.
by Alexandre Julliard June 18, 2024

June 18, 2024

Module: wine Branch: master Commit: 299490ed7bb28ccd8857198fe105ca03c7012d94 URL: https://gitlab.winehq.org/wine/wine/-/commit/299490ed7bb28ccd8857198fe105ca… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jun 18 11:22:19 2024 +0200 dwrite/tests: Ignore macOS specific "flip" sbix format. --- dlls/dwrite/tests/font.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index e2b5b9163f1..4bd193af4cb 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -9297,6 +9297,9 @@ static DWORD get_sbix_formats(IDWriteFontFace4 *fontface) case MS_TIFF_TAG: ret |= DWRITE_GLYPH_IMAGE_FORMATS_TIFF; break; + case DWRITE_MAKE_OPENTYPE_TAG('f','l','i','p'): + /* ignore macOS-specific tag */ + break; default: ok(0, "unexpected format, %#lx\n", GET_BE_DWORD(format)); }

1 0

Daniel Lehman : odbc32: StrLen_or_Ind passed to SQLBindCol can be NULL.
by Alexandre Julliard June 18, 2024

June 18, 2024

Module: wine Branch: master Commit: a23b754f068b790948ad15fb73e0f33a4d9e6001 URL: https://gitlab.winehq.org/wine/wine/-/commit/a23b754f068b790948ad15fb73e0f3… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu Jun 6 17:16:02 2024 -0700 odbc32: StrLen_or_Ind passed to SQLBindCol can be NULL. --- dlls/odbc32/proxyodbc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index 4b847b3b874..d97837e5bca 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -235,8 +235,7 @@ SQLRETURN WINAPI SQLBindCol(SQLHSTMT StatementHandle, SQLUSMALLINT ColumnNumber, } if (!alloc_binding( &handle->bind_col, SQL_PARAM_INPUT_OUTPUT, ColumnNumber, handle->row_count )) return SQL_ERROR; params.StatementHandle = handle->unix_handle; - params.StrLen_or_Ind = handle->bind_col.param[i].len; - *(UINT64 *)params.StrLen_or_Ind = *StrLen_or_Ind; + if (StrLen_or_Ind) 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; TRACE ("Returning %d\n", ret); return ret;

1 0

Daniel Lehman : odbc32: Handle both directions for SQLBindParameter().
by Alexandre Julliard June 18, 2024

June 18, 2024

Module: wine Branch: master Commit: f68e91966cbe1a8d5f8314ec6941fb4716b8286d URL: https://gitlab.winehq.org/wine/wine/-/commit/f68e91966cbe1a8d5f8314ec6941fb… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu May 30 17:19:34 2024 -0700 odbc32: Handle both directions for SQLBindParameter(). Pointers can be filled after the call to SQLBindParameter() so it needs to be read at SQLExecute(). --- dlls/odbc32/proxyodbc.c | 119 +++++++++++++++++++++++++++++------------------- dlls/odbc32/unixlib.h | 1 + 2 files changed, 72 insertions(+), 48 deletions(-) diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index 658dda29a6c..ab89c93a4a8 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -198,7 +198,7 @@ static const char *debugstr_sqllen( SQLLEN len ) } #define MAX_BINDING_PARAMS 1024 -static BOOL alloc_binding( struct param_binding *binding, UINT column, UINT row_count ) +static BOOL alloc_binding( struct param_binding *binding, USHORT type, UINT column, UINT row_count ) { if (column > MAX_BINDING_PARAMS) { @@ -208,6 +208,7 @@ static BOOL alloc_binding( struct param_binding *binding, UINT column, UINT row_ if (!binding->param && !(binding->param = calloc( MAX_BINDING_PARAMS, sizeof(*binding->param)))) return FALSE; if (!(binding->param[column - 1].len = calloc( row_count, sizeof(UINT64) ))) return FALSE; + binding->param[column - 1].type = type; binding->count = column; return TRUE; } @@ -232,7 +233,7 @@ SQLRETURN WINAPI SQLBindCol(SQLHSTMT StatementHandle, SQLUSMALLINT ColumnNumber, FIXME( "column 0 not handled\n" ); return SQL_ERROR; } - if (!alloc_binding( &handle->bind_col, ColumnNumber, handle->row_count )) return SQL_ERROR; + if (!alloc_binding( &handle->bind_col, SQL_PARAM_INPUT_OUTPUT, ColumnNumber, handle->row_count )) return SQL_ERROR; params.StatementHandle = handle->unix_handle; params.StrLen_or_Ind = handle->bind_col.param[i].len; *(UINT64 *)params.StrLen_or_Ind = *StrLen_or_Ind; @@ -273,7 +274,7 @@ SQLRETURN WINAPI SQLBindParam(SQLHSTMT StatementHandle, SQLUSMALLINT ParameterNu FIXME( "parameter 0 not handled\n" ); return SQL_ERROR; } - if (!alloc_binding( &handle->bind_param, ParameterNumber, handle->row_count )) return SQL_ERROR; + if (!alloc_binding( &handle->bind_param, SQL_PARAM_INPUT, ParameterNumber, handle->row_count )) return SQL_ERROR; params.StatementHandle = handle->unix_handle; params.StrLen_or_Ind = handle->bind_param.param[i].len; @@ -586,6 +587,66 @@ SQLRETURN WINAPI SQLExecDirect(SQLHSTMT StatementHandle, SQLCHAR *StatementText, return ret; } +static void len_to_user( SQLLEN *ptr, UINT8 *len, UINT row_count, UINT width ) +{ + UINT i; + for (i = 0; i < row_count; i++) + { + *ptr++ = *(SQLLEN *)(len + i * width); + } +} + +static void len_from_user( UINT8 *len, SQLLEN *ptr, UINT row_count, UINT width ) +{ + UINT i; + for (i = 0; i < row_count; i++) + { + *(SQLLEN *)(len + i * width) = *ptr++; + } +} + +static void update_result_lengths( struct handle *handle, USHORT type ) +{ + UINT i, width = sizeof(void *) == 8 ? 8 : is_wow64 ? 8 : 4; + + switch (type) + { + case SQL_PARAM_OUTPUT: + for (i = 0; i < handle->bind_col.count; i++) + { + len_to_user( handle->bind_col.param[i].ptr, handle->bind_col.param[i].len, handle->row_count, width ); + } + for (i = 0; i < handle->bind_param.count; i++) + { + len_to_user( handle->bind_param.param[i].ptr, handle->bind_param.param[i].len, handle->row_count, width ); + } + for (i = 0; i < handle->bind_parameter.count; i++) + { + if (handle->bind_parameter.param[i].type != SQL_PARAM_OUTPUT && + handle->bind_parameter.param[i].type != SQL_PARAM_INPUT_OUTPUT) continue; + + len_to_user( handle->bind_parameter.param[i].ptr, handle->bind_parameter.param[i].len, handle->row_count, width ); + } + break; + + case SQL_PARAM_INPUT: + for (i = 0; i < handle->bind_col.count; i++) + { + len_from_user( handle->bind_col.param[i].len, handle->bind_col.param[i].ptr, handle->row_count, width ); + } + /* FIXME: handle bind_param */ + for (i = 0; i < handle->bind_parameter.count; i++) + { + if (handle->bind_parameter.param[i].type != SQL_PARAM_INPUT && + handle->bind_parameter.param[i].type != SQL_PARAM_INPUT_OUTPUT) continue; + + len_from_user( handle->bind_parameter.param[i].len, handle->bind_parameter.param[i].ptr, handle->row_count, width ); + } + + default: break; + } +} + /************************************************************************* * SQLExecute [ODBC32.012] */ @@ -600,50 +661,12 @@ SQLRETURN WINAPI SQLExecute(SQLHSTMT StatementHandle) if (!handle) return SQL_INVALID_HANDLE; params.StatementHandle = handle->unix_handle; - ret = ODBC_CALL( SQLExecute, &params ); + update_result_lengths( handle, SQL_PARAM_INPUT ); + if (SUCCESS(( ret = ODBC_CALL( SQLExecute, &params )))) update_result_lengths( handle, SQL_PARAM_OUTPUT ); TRACE("Returning %d\n", ret); return ret; } -static void update_result_lengths( struct handle *handle ) -{ - UINT i, j, width = sizeof(void *) == 8 ? 8 : is_wow64 ? 8 : 4; - - for (i = 0; i < handle->bind_col.count; i++) - { - SQLLEN *ptr = handle->bind_col.param[i].ptr; - if (ptr) - { - for (j = 0; j < handle->row_count; j++) - { - *ptr++ = *(SQLLEN *)(handle->bind_col.param[i].len + j * width); - } - } - } - for (i = 0; i < handle->bind_param.count; i++) - { - SQLLEN *ptr = handle->bind_param.param[i].ptr; - if (ptr) - { - for (j = 0; j < handle->row_count; j++) - { - *ptr++ = *(SQLLEN *)(handle->bind_param.param[i].len + j * width); - } - } - } - for (i = 0; i < handle->bind_parameter.count; i++) - { - SQLLEN *ptr = handle->bind_parameter.param[i].ptr; - if (ptr) - { - for (j = 0; j < handle->row_count; j++) - { - *ptr++ = *(SQLLEN *)(handle->bind_parameter.param[i].len + j * width); - } - } - } -} - /************************************************************************* * SQLFetch [ODBC32.013] */ @@ -658,7 +681,7 @@ SQLRETURN WINAPI SQLFetch(SQLHSTMT StatementHandle) if (!handle) return SQL_INVALID_HANDLE; params.StatementHandle = handle->unix_handle; - if (SUCCESS(( ret = ODBC_CALL( SQLFetch, &params )))) update_result_lengths( handle ); + if (SUCCESS(( ret = ODBC_CALL( SQLFetch, &params )))) update_result_lengths( handle, SQL_PARAM_OUTPUT ); TRACE("Returning %d\n", ret); return ret; } @@ -678,7 +701,7 @@ SQLRETURN WINAPI SQLFetchScroll(SQLHSTMT StatementHandle, SQLSMALLINT FetchOrien if (!handle) return SQL_INVALID_HANDLE; params.StatementHandle = handle->unix_handle; - if (SUCCESS(( ret = ODBC_CALL( SQLFetchScroll, &params )))) update_result_lengths( handle ); + if (SUCCESS(( ret = ODBC_CALL( SQLFetchScroll, &params )))) update_result_lengths( handle, SQL_PARAM_OUTPUT ); TRACE("Returning %d\n", ret); return ret; } @@ -1560,7 +1583,7 @@ SQLRETURN WINAPI SQLBulkOperations(SQLHSTMT StatementHandle, SQLSMALLINT Operati if (!handle) return SQL_INVALID_HANDLE; params.StatementHandle = handle->unix_handle; - if (SUCCESS(( ret = ODBC_CALL( SQLBulkOperations, &params )))) update_result_lengths( handle ); + if (SUCCESS(( ret = ODBC_CALL( SQLBulkOperations, &params )))) update_result_lengths( handle, SQL_PARAM_OUTPUT ); TRACE("Returning %d\n", ret); return ret; } @@ -1876,7 +1899,7 @@ SQLRETURN WINAPI SQLSetPos(SQLHSTMT StatementHandle, SQLSETPOSIROW RowNumber, SQ params.StatementHandle = handle->unix_handle; if (SUCCESS(( ret = ODBC_CALL( SQLSetPos, &params ))) && Operation == SQL_REFRESH) - update_result_lengths( handle ); + update_result_lengths( handle, SQL_PARAM_OUTPUT ); TRACE("Returning %d\n", ret); return ret; } @@ -1961,7 +1984,7 @@ SQLRETURN WINAPI SQLBindParameter(SQLHSTMT StatementHandle, SQLUSMALLINT Paramet FIXME( "parameter 0 not handled\n" ); return SQL_ERROR; } - if (!alloc_binding( &handle->bind_parameter, ParameterNumber, handle->row_count )) return SQL_ERROR; + if (!alloc_binding( &handle->bind_parameter, InputOutputType, ParameterNumber, handle->row_count )) return SQL_ERROR; params.StatementHandle = handle->unix_handle; params.StrLen_or_Ind = handle->bind_parameter.param[i].len; diff --git a/dlls/odbc32/unixlib.h b/dlls/odbc32/unixlib.h index c021eb22c50..0c683340cbe 100644 --- a/dlls/odbc32/unixlib.h +++ b/dlls/odbc32/unixlib.h @@ -154,6 +154,7 @@ enum sql_funcs struct param { + INT16 type; UINT8 *len; /* result length array stored in Unix lib */ void *ptr; /* result length ptr passed by client */ };

1 0

Daniel Lehman : odbc32: Numeric attribute pointer may be null if not a numeric type in SQLColAttribute().
by Alexandre Julliard June 18, 2024

June 18, 2024

Module: wine Branch: master Commit: 133f14415f0c3e4aebd1ea9e7d28087cfd0aaf85 URL: https://gitlab.winehq.org/wine/wine/-/commit/133f14415f0c3e4aebd1ea9e7d2808… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Jun 4 09:41:21 2024 -0700 odbc32: Numeric attribute pointer may be null if not a numeric type in SQLColAttribute(). --- dlls/odbc32/proxyodbc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index ab89c93a4a8..4b847b3b874 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -343,7 +343,7 @@ SQLRETURN WINAPI SQLColAttribute(SQLHSTMT StatementHandle, SQLUSMALLINT ColumnNu params.StatementHandle = handle->unix_handle; params.NumericAttribute = &num_attr; - if (SUCCESS(( ret = ODBC_CALL( SQLColAttribute, &params )))) *NumericAttribute = num_attr; + if (SUCCESS(( ret = ODBC_CALL( SQLColAttribute, &params ))) && NumericAttribute) *NumericAttribute = num_attr; TRACE("Returning %d\n", ret); return ret; } @@ -2300,7 +2300,7 @@ SQLRETURN WINAPI SQLColAttributeW(SQLHSTMT StatementHandle, SQLUSMALLINT ColumnN params.StatementHandle = handle->unix_handle; params.NumericAttribute = &attr; - if (SUCCESS((ret = ODBC_CALL( SQLColAttributeW, &params )))) *NumericAttribute = attr; + if (SUCCESS((ret = ODBC_CALL( SQLColAttributeW, &params ))) && NumericAttribute) *NumericAttribute = attr; if (ret == SQL_SUCCESS && CharacterAttribute != NULL && SQLColAttributes_KnownStringAttribute(FieldIdentifier) && StringLength && *StringLength != wcslen(CharacterAttribute) * 2)

1 0

Alexandre Julliard : kernelbase: Send cross process notifications in FlushInstructionCache on ARM64.
by Alexandre Julliard June 18, 2024

June 18, 2024

Module: wine Branch: master Commit: 9c6fb2b30c870e9e50079a0c49426c90353198df URL: https://gitlab.winehq.org/wine/wine/-/commit/9c6fb2b30c870e9e50079a0c49426c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 18 12:55:41 2024 +0200 kernelbase: Send cross process notifications in FlushInstructionCache on ARM64. --- dlls/kernelbase/memory.c | 16 ++++++++++++++++ dlls/kernelbase/process.c | 9 --------- dlls/ntdll/tests/wow64.c | 1 - 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index 2e30ebc9067..faa6bd7d5ee 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -122,6 +122,22 @@ BOOL WINAPI DECLSPEC_HOTPATCH FlushViewOfFile( const void *base, SIZE_T size ) } +/**************************************************************************** + * FlushInstructionCache (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH FlushInstructionCache( HANDLE process, LPCVOID addr, SIZE_T size ) +{ + CROSS_PROCESS_WORK_LIST *list; + + if ((list = open_cross_process_connection( process ))) + { + send_cross_process_notification( list, CrossProcessFlushCache, addr, size, 0 ); + close_cross_process_connection( list ); + } + return set_ntstatus( NtFlushInstructionCache( process, addr, size )); +} + + /*********************************************************************** * GetLargePageMinimum (kernelbase.@) */ diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index 775512e7f0d..2d08481cd35 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -737,15 +737,6 @@ BOOL WINAPI DECLSPEC_HOTPATCH DuplicateHandle( HANDLE source_process, HANDLE sou } -/**************************************************************************** - * FlushInstructionCache (kernelbase.@) - */ -BOOL WINAPI DECLSPEC_HOTPATCH FlushInstructionCache( HANDLE process, LPCVOID addr, SIZE_T size ) -{ - return set_ntstatus( NtFlushInstructionCache( process, addr, size )); -} - - /*********************************************************************** * GetApplicationRestartSettings (kernelbase.@) */ diff --git a/dlls/ntdll/tests/wow64.c b/dlls/ntdll/tests/wow64.c index 5d4fe4f9fef..67770cb9b59 100644 --- a/dlls/ntdll/tests/wow64.c +++ b/dlls/ntdll/tests/wow64.c @@ -713,7 +713,6 @@ static void test_cross_process_notifications( HANDLE process, ULONG_PTR section, FlushInstructionCache( process, addr, 0x1234 ); entry = pop_from_work_list( &list->work_list ); - todo_wine_if (current_machine == IMAGE_FILE_MACHINE_ARM64) entry = expect_cross_work_entry( list, entry, CrossProcessFlushCache, addr, 0x1234, 0xcccccccc, 0xcccccccc, 0xcccccccc, 0xcccccccc ); ok( !entry, "not at end of list\n" );

1 0

Alexandre Julliard : kernelbase: Send cross process notifications in WriteProcessMemory on ARM64.
by Alexandre Julliard June 18, 2024

June 18, 2024

Module: wine Branch: master Commit: 2c7f4181bc7fdc08ff5eba8492841015f87bff2e URL: https://gitlab.winehq.org/wine/wine/-/commit/2c7f4181bc7fdc08ff5eba84928410… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 18 12:48:19 2024 +0200 kernelbase: Send cross process notifications in WriteProcessMemory on ARM64. --- dlls/kernelbase/memory.c | 77 +++++++++++++++++++++++++++++++++++++++++++++--- dlls/ntdll/tests/wow64.c | 3 -- 2 files changed, 73 insertions(+), 7 deletions(-) diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index d552e5b81d8..2e30ebc9067 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -42,6 +42,53 @@ WINE_DECLARE_DEBUG_CHANNEL(virtual); WINE_DECLARE_DEBUG_CHANNEL(globalmem); + +static CROSS_PROCESS_WORK_LIST *open_cross_process_connection( HANDLE process ) +{ +#ifdef __aarch64__ + CROSS_PROCESS_WORK_LIST *list; + HANDLE section; + + RtlOpenCrossProcessEmulatorWorkConnection( process, &section, (void **)&list ); + if (section) NtClose( section ); + return list; +#else + return NULL; +#endif +} + +static void close_cross_process_connection( CROSS_PROCESS_WORK_LIST *list ) +{ + if (list) NtUnmapViewOfSection( GetCurrentProcess(), list ); +} + +static void send_cross_process_notification( CROSS_PROCESS_WORK_LIST *list, UINT id, + const void *addr, SIZE_T size, int nb_args, ... ) +{ +#ifdef __aarch64__ + CROSS_PROCESS_WORK_ENTRY *entry; + void *unused; + va_list args; + int i; + + if (!list) return; + if ((entry = RtlWow64PopCrossProcessWorkFromFreeList( &list->free_list ))) + { + entry->id = id; + entry->addr = (ULONG_PTR)addr; + entry->size = size; + if (nb_args) + { + va_start( args, nb_args ); + for (i = 0; i < nb_args; i++) entry->args[i] = va_arg( args, int ); + va_end( args ); + } + RtlWow64PushCrossProcessWorkOntoWorkList( &list->work_list, entry, &unused ); + } +#endif +} + + /*********************************************************************** * Virtual memory functions ***********************************************************************/ @@ -540,13 +587,18 @@ BOOL WINAPI DECLSPEC_HOTPATCH VirtualUnlock( void *addr, SIZE_T size ) BOOL WINAPI DECLSPEC_HOTPATCH WriteProcessMemory( HANDLE process, void *addr, const void *buffer, SIZE_T size, SIZE_T *bytes_written ) { + CROSS_PROCESS_WORK_LIST *list = open_cross_process_connection( process ); DWORD old_prot, prot = PAGE_TARGETS_NO_UPDATE | PAGE_ENCLAVE_NO_CHANGE | PAGE_EXECUTE_WRITECOPY; MEMORY_BASIC_INFORMATION info; void *base_addr; SIZE_T region_size; - NTSTATUS status; + NTSTATUS status, status2; - if (!VirtualQueryEx( process, addr, &info, sizeof(info) )) return FALSE; + if (!VirtualQueryEx( process, addr, &info, sizeof(info) )) + { + close_cross_process_connection( list ); + return FALSE; + } switch (info.Protect) { @@ -556,6 +608,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH WriteProcessMemory( HANDLE process, void *addr, co case PAGE_EXECUTE_WRITECOPY: /* already writable */ if ((status = NtWriteVirtualMemory( process, addr, buffer, size, bytes_written ))) break; + send_cross_process_notification( list, CrossProcessFlushCache, addr, size, 0 ); NtFlushInstructionCache( process, addr, size ); break; @@ -565,12 +618,27 @@ BOOL WINAPI DECLSPEC_HOTPATCH WriteProcessMemory( HANDLE process, void *addr, co base_addr = ROUND_ADDR( addr ); region_size = ROUND_SIZE( addr, size ); region_size = min( region_size, (char *)info.BaseAddress + info.RegionSize - (char *)base_addr ); + + send_cross_process_notification( list, CrossProcessPreVirtualProtect, + base_addr, region_size, 1, prot ); status = NtProtectVirtualMemory( process, &base_addr, &region_size, prot, &old_prot ); + send_cross_process_notification( list, CrossProcessPostVirtualProtect, + base_addr, region_size, 2, prot, status ); if (status) break; + status = NtWriteVirtualMemory( process, addr, buffer, size, bytes_written ); - if (!status) NtFlushInstructionCache( process, addr, size ); + if (!status) + { + send_cross_process_notification( list, CrossProcessFlushCache, addr, size, 0 ); + NtFlushInstructionCache( process, addr, size ); + } + prot = PAGE_TARGETS_NO_UPDATE | PAGE_ENCLAVE_NO_CHANGE | old_prot; - NtProtectVirtualMemory( process, &base_addr, &region_size, prot, &old_prot ); + send_cross_process_notification( list, CrossProcessPreVirtualProtect, + base_addr, region_size, 1, prot ); + status2 = NtProtectVirtualMemory( process, &base_addr, &region_size, prot, &old_prot ); + send_cross_process_notification( list, CrossProcessPostVirtualProtect, + base_addr, region_size, 2, prot, status2 ); break; default: @@ -579,6 +647,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH WriteProcessMemory( HANDLE process, void *addr, co break; } + close_cross_process_connection( list ); return set_ntstatus( status ); } diff --git a/dlls/ntdll/tests/wow64.c b/dlls/ntdll/tests/wow64.c index a8849ae5633..5d4fe4f9fef 100644 --- a/dlls/ntdll/tests/wow64.c +++ b/dlls/ntdll/tests/wow64.c @@ -729,8 +729,6 @@ static void test_cross_process_notifications( HANDLE process, ULONG_PTR section, WriteProcessMemory( process, (char *)addr + 0x1ffe, data, sizeof(data), &size ); entry = pop_from_work_list( &list->work_list ); - todo_wine_if (current_machine == IMAGE_FILE_MACHINE_ARM64) - { entry = expect_cross_work_entry( list, entry, CrossProcessPreVirtualProtect, (char *)addr + 0x1000, 0x2000, 0x60000000 | PAGE_EXECUTE_WRITECOPY, (current_machine != IMAGE_FILE_MACHINE_ARM64) ? 0 : 0xcccccccc, @@ -748,7 +746,6 @@ static void test_cross_process_notifications( HANDLE process, ULONG_PTR section, entry = expect_cross_work_entry( list, entry, CrossProcessPostVirtualProtect, (char *)addr + 0x1000, 0x2000, 0x60000000 | PAGE_EXECUTE_READ, 0, 0xcccccccc, 0xcccccccc ); - } ok( !entry, "not at end of list\n" ); status = NtUnmapViewOfSection( process, addr );

1 0

Alexandre Julliard : kernelbase: Make memory writable in WriteProcessMemory if necessary.
by Alexandre Julliard June 18, 2024

June 18, 2024

Module: wine Branch: master Commit: 6ea77ec0864eb7870ce3418bf828077c2a072413 URL: https://gitlab.winehq.org/wine/wine/-/commit/6ea77ec0864eb7870ce3418bf82807… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 18 12:08:03 2024 +0200 kernelbase: Make memory writable in WriteProcessMemory if necessary. --- dlls/kernel32/tests/virtual.c | 2 -- dlls/kernelbase/memory.c | 44 ++++++++++++++++++++++++++++++++++++++++++- dlls/ntdll/tests/wow64.c | 2 +- include/winnt.h | 40 ++++++++++++++++++++++++++++----------- 4 files changed, 73 insertions(+), 15 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 86cd3bc9015..5fa8a1b5266 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -206,10 +206,8 @@ static void test_VirtualAllocEx(void) ok( b, "VirtualProtectEx, error %lu\n", GetLastError() ); bytes_written = 0xdeadbeef; b = WriteProcessMemory(hProcess, addr1, src, alloc_size, &bytes_written); - todo_wine ok( !b, "WriteProcessMemory succeeded\n" ); if (!b) ok( GetLastError() == ERROR_NOACCESS, "wrong error %lu\n", GetLastError() ); - todo_wine ok( bytes_written == 0xdeadbeef, "%Iu bytes written\n", bytes_written ); status = pNtWriteVirtualMemory( hProcess, addr1, src, alloc_size, &bytes_written ); todo_wine diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index 4f4bba9a13b..d552e5b81d8 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -46,6 +46,9 @@ WINE_DECLARE_DEBUG_CHANNEL(globalmem); * Virtual memory functions ***********************************************************************/ +static const SIZE_T page_mask = 0xfff; +#define ROUND_ADDR(addr) ((void *)((UINT_PTR)(addr) & ~page_mask)) +#define ROUND_SIZE(addr,size) (((SIZE_T)(size) + ((UINT_PTR)(addr) & page_mask) + page_mask) & ~page_mask) /*********************************************************************** * DiscardVirtualMemory (kernelbase.@) @@ -537,7 +540,46 @@ BOOL WINAPI DECLSPEC_HOTPATCH VirtualUnlock( void *addr, SIZE_T size ) BOOL WINAPI DECLSPEC_HOTPATCH WriteProcessMemory( HANDLE process, void *addr, const void *buffer, SIZE_T size, SIZE_T *bytes_written ) { - return set_ntstatus( NtWriteVirtualMemory( process, addr, buffer, size, bytes_written )); + DWORD old_prot, prot = PAGE_TARGETS_NO_UPDATE | PAGE_ENCLAVE_NO_CHANGE | PAGE_EXECUTE_WRITECOPY; + MEMORY_BASIC_INFORMATION info; + void *base_addr; + SIZE_T region_size; + NTSTATUS status; + + if (!VirtualQueryEx( process, addr, &info, sizeof(info) )) return FALSE; + + switch (info.Protect) + { + case PAGE_READWRITE: + case PAGE_WRITECOPY: + case PAGE_EXECUTE_READWRITE: + case PAGE_EXECUTE_WRITECOPY: + /* already writable */ + if ((status = NtWriteVirtualMemory( process, addr, buffer, size, bytes_written ))) break; + NtFlushInstructionCache( process, addr, size ); + break; + + case PAGE_EXECUTE: + case PAGE_EXECUTE_READ: + /* make it writable */ + base_addr = ROUND_ADDR( addr ); + region_size = ROUND_SIZE( addr, size ); + region_size = min( region_size, (char *)info.BaseAddress + info.RegionSize - (char *)base_addr ); + status = NtProtectVirtualMemory( process, &base_addr, &region_size, prot, &old_prot ); + if (status) break; + status = NtWriteVirtualMemory( process, addr, buffer, size, bytes_written ); + if (!status) NtFlushInstructionCache( process, addr, size ); + prot = PAGE_TARGETS_NO_UPDATE | PAGE_ENCLAVE_NO_CHANGE | old_prot; + NtProtectVirtualMemory( process, &base_addr, &region_size, prot, &old_prot ); + break; + + default: + /* not writable */ + status = STATUS_ACCESS_VIOLATION; + break; + } + + return set_ntstatus( status ); } diff --git a/dlls/ntdll/tests/wow64.c b/dlls/ntdll/tests/wow64.c index 77f6f304289..a8849ae5633 100644 --- a/dlls/ntdll/tests/wow64.c +++ b/dlls/ntdll/tests/wow64.c @@ -729,7 +729,7 @@ static void test_cross_process_notifications( HANDLE process, ULONG_PTR section, WriteProcessMemory( process, (char *)addr + 0x1ffe, data, sizeof(data), &size ); entry = pop_from_work_list( &list->work_list ); - todo_wine + todo_wine_if (current_machine == IMAGE_FILE_MACHINE_ARM64) { entry = expect_cross_work_entry( list, entry, CrossProcessPreVirtualProtect, (char *)addr + 0x1000, 0x2000, 0x60000000 | PAGE_EXECUTE_WRITECOPY, diff --git a/include/winnt.h b/include/winnt.h index b18d255a79c..c4749bf7028 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -815,17 +815,35 @@ typedef struct DECLSPEC_ALIGN(8) MEM_EXTENDED_PARAMETER { #define MEM_EXTENDED_PARAMETER_EC_CODE 0x00000040 #define MEM_EXTENDED_PARAMETER_IMAGE_NO_HPAT 0x00000080 -#define PAGE_NOACCESS 0x01 -#define PAGE_READONLY 0x02 -#define PAGE_READWRITE 0x04 -#define PAGE_WRITECOPY 0x08 -#define PAGE_EXECUTE 0x10 -#define PAGE_EXECUTE_READ 0x20 -#define PAGE_EXECUTE_READWRITE 0x40 -#define PAGE_EXECUTE_WRITECOPY 0x80 -#define PAGE_GUARD 0x100 -#define PAGE_NOCACHE 0x200 -#define PAGE_WRITECOMBINE 0x400 +#define PAGE_NOACCESS 0x00000001 +#define PAGE_READONLY 0x00000002 +#define PAGE_READWRITE 0x00000004 +#define PAGE_WRITECOPY 0x00000008 +#define PAGE_EXECUTE 0x00000010 +#define PAGE_EXECUTE_READ 0x00000020 +#define PAGE_EXECUTE_READWRITE 0x00000040 +#define PAGE_EXECUTE_WRITECOPY 0x00000080 +#define PAGE_GUARD 0x00000100 +#define PAGE_NOCACHE 0x00000200 +#define PAGE_WRITECOMBINE 0x00000400 +#define PAGE_GRAPHICS_NOACCESS 0x00000800 +#define PAGE_GRAPHICS_READONLY 0x00001000 +#define PAGE_GRAPHICS_READWRITE 0x00002000 +#define PAGE_GRAPHICS_EXECUTE 0x00004000 +#define PAGE_GRAPHICS_EXECUTE_READ 0x00008000 +#define PAGE_GRAPHICS_EXECUTE_READWRITE 0x00010000 +#define PAGE_GRAPHICS_COHERENT 0x00020000 +#define PAGE_GRAPHICS_NOCACHE 0x00040000 +#define PAGE_ENCLAVE_MASK 0x10000000 +#define PAGE_ENCLAVE_UNVALIDATED 0x20000000 +#define PAGE_ENCLAVE_NO_CHANGE 0x20000000 +#define PAGE_TARGETS_NO_UPDATE 0x40000000 +#define PAGE_TARGETS_INVALID 0x40000000 +#define PAGE_REVERT_TO_FILE_MAP 0x80000000 +#define PAGE_ENCLAVE_THREAD_CONTROL 0x80000000 +#define PAGE_ENCLAVE_DECOMMIT (PAGE_ENCLAVE_MASK | 0) +#define PAGE_ENCLAVE_SS_FIRST (PAGE_ENCLAVE_MASK | 1) +#define PAGE_ENCLAVE_SS_REST (PAGE_ENCLAVE_MASK | 2) #define MEM_COMMIT 0x00001000 #define MEM_RESERVE 0x00002000

1 0

Alexandre Julliard : kernel32/tests: Add some tests for WriteProcessMemory/NtWriteVirtualMemory.
by Alexandre Julliard June 18, 2024

June 18, 2024

Module: wine Branch: master Commit: b63931983084eef5eb2e492cbc58d6ef9ea04bc2 URL: https://gitlab.winehq.org/wine/wine/-/commit/b63931983084eef5eb2e492cbc58d6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 18 11:55:27 2024 +0200 kernel32/tests: Add some tests for WriteProcessMemory/NtWriteVirtualMemory. --- dlls/kernel32/tests/virtual.c | 110 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 105 insertions(+), 5 deletions(-)

1 0

Alexandre Julliard : ntdll/tests: Add test for cross-process notifications on ARM64EC.
by Alexandre Julliard June 18, 2024

June 18, 2024

Module: wine Branch: master Commit: 6eefb42a41d44f5d637833face17afeecad9098b URL: https://gitlab.winehq.org/wine/wine/-/commit/6eefb42a41d44f5d637833face17af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 18 10:52:48 2024 +0200 ntdll/tests: Add test for cross-process notifications on ARM64EC. --- dlls/ntdll/tests/wow64.c | 266 +++++++++++++++++++++++++++++++---------------- 1 file changed, 177 insertions(+), 89 deletions(-)

1 0