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

Rémi Bernon : server: Return the desktop object locator in (get|set)_thread_desktop.
by Alexandre Julliard June 20, 2024

June 20, 2024

Module: wine Branch: master Commit: 20f4c9af0f44be34b54c8c0c10b302d86303fafd URL: https://gitlab.winehq.org/wine/wine/-/commit/20f4c9af0f44be34b54c8c0c10b302… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Mar 16 20:41:13 2024 +0100 server: Return the desktop object locator in (get|set)_thread_desktop. --- include/wine/server_protocol.h | 14 +++++++++++--- server/file.h | 1 + server/mapping.c | 7 +++++++ server/protocol.def | 11 ++++++++++- server/request.h | 8 ++++++-- server/trace.c | 18 ++++++++++++++++-- server/winstation.c | 10 ++++++++++ tools/make_requests | 1 + 8 files changed, 62 insertions(+), 8 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index b75b88b956d..ec9b335b436 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -900,6 +900,12 @@ typedef volatile struct object_shm_t shm; } shared_object_t; +typedef struct +{ + object_id_t id; + mem_size_t offset; +} obj_locator_t; + @@ -3895,8 +3901,9 @@ struct get_thread_desktop_request struct get_thread_desktop_reply { struct reply_header __header; - obj_handle_t handle; - char __pad_12[4]; + obj_locator_t locator; + obj_handle_t handle; + char __pad_28[4]; }; @@ -3909,6 +3916,7 @@ struct set_thread_desktop_request struct set_thread_desktop_reply { struct reply_header __header; + obj_locator_t locator; }; @@ -6552,7 +6560,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 810 +#define SERVER_PROTOCOL_VERSION 811 /* ### protocol_version end ### */ diff --git a/server/file.h b/server/file.h index abfc2f0a2ce..89f91c52993 100644 --- a/server/file.h +++ b/server/file.h @@ -194,6 +194,7 @@ extern void set_session_mapping( struct mapping *mapping ); extern const volatile void *alloc_shared_object(void); extern void free_shared_object( const volatile void *object_shm ); +extern obj_locator_t get_shared_object_locator( const volatile void *object_shm ); #define SHARED_WRITE_BEGIN( object_shm, type ) \ do { \ diff --git a/server/mapping.c b/server/mapping.c index f77de343f4f..92eb0c9f076 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -1407,6 +1407,13 @@ void free_shared_object( const volatile void *object_shm ) list_add_tail( &session.free_objects, &object->entry ); } +obj_locator_t get_shared_object_locator( const volatile void *object_shm ) +{ + struct session_object *object = CONTAINING_RECORD( object_shm, struct session_object, obj.shm ); + obj_locator_t locator = {.offset = object->offset, .id = object->obj.id}; + return locator; +} + struct object *create_user_data_mapping( struct object *root, const struct unicode_str *name, unsigned int attr, const struct security_descriptor *sd ) { diff --git a/server/protocol.def b/server/protocol.def index de763210ac9..a832296bb30 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -916,6 +916,12 @@ typedef volatile struct object_shm_t shm; /* object shared data */ } shared_object_t; +typedef struct +{ + object_id_t id; /* object unique id, object data is valid if != 0 */ + mem_size_t offset; /* offset of the object in session shared memory */ +} obj_locator_t; + /****************************************************************/ /* Request declarations */ @@ -2813,13 +2819,16 @@ enum coords_relative @REQ(get_thread_desktop) thread_id_t tid; /* thread id */ @REPLY - obj_handle_t handle; /* handle to the desktop */ + obj_locator_t locator; /* locator for the shared session object */ + obj_handle_t handle; /* handle to the desktop */ @END /* Set the thread current desktop */ @REQ(set_thread_desktop) obj_handle_t handle; /* handle to the desktop */ +(a)REPLY + obj_locator_t locator; /* locator for the shared session object */ @END diff --git a/server/request.h b/server/request.h index fe323d4785a..8408c875306 100644 --- a/server/request.h +++ b/server/request.h @@ -721,6 +721,7 @@ C_ASSERT( sizeof(mem_size_t) == 8 ); C_ASSERT( sizeof(message_data_t) == 48 ); C_ASSERT( sizeof(mod_handle_t) == 8 ); C_ASSERT( sizeof(obj_handle_t) == 4 ); +C_ASSERT( sizeof(obj_locator_t) == 16 ); C_ASSERT( sizeof(object_id_t) == 8 ); C_ASSERT( sizeof(pe_image_info_t) == 88 ); C_ASSERT( sizeof(process_id_t) == 4 ); @@ -1745,10 +1746,13 @@ C_ASSERT( FIELD_OFFSET(struct close_desktop_request, handle) == 12 ); C_ASSERT( sizeof(struct close_desktop_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_thread_desktop_request, tid) == 12 ); C_ASSERT( sizeof(struct get_thread_desktop_request) == 16 ); -C_ASSERT( FIELD_OFFSET(struct get_thread_desktop_reply, handle) == 8 ); -C_ASSERT( sizeof(struct get_thread_desktop_reply) == 16 ); +C_ASSERT( FIELD_OFFSET(struct get_thread_desktop_reply, locator) == 8 ); +C_ASSERT( FIELD_OFFSET(struct get_thread_desktop_reply, handle) == 24 ); +C_ASSERT( sizeof(struct get_thread_desktop_reply) == 32 ); C_ASSERT( FIELD_OFFSET(struct set_thread_desktop_request, handle) == 12 ); C_ASSERT( sizeof(struct set_thread_desktop_request) == 16 ); +C_ASSERT( FIELD_OFFSET(struct set_thread_desktop_reply, locator) == 8 ); +C_ASSERT( sizeof(struct set_thread_desktop_reply) == 24 ); C_ASSERT( FIELD_OFFSET(struct enum_desktop_request, winstation) == 12 ); C_ASSERT( FIELD_OFFSET(struct enum_desktop_request, index) == 16 ); C_ASSERT( sizeof(struct enum_desktop_request) == 24 ); diff --git a/server/trace.c b/server/trace.c index 08adda28230..f19cd9c6189 100644 --- a/server/trace.c +++ b/server/trace.c @@ -467,6 +467,14 @@ static void dump_hw_input( const char *prefix, const hw_input_t *input ) } } +static void dump_obj_locator( const char *prefix, const obj_locator_t *locator ) +{ + fprintf( stderr, "%s{", prefix ); + dump_uint64( "id=", &locator->id ); + dump_uint64( ",offset=", &locator->offset ); + fprintf( stderr, "}" ); +} + static void dump_luid( const char *prefix, const struct luid *luid ) { fprintf( stderr, "%s%d.%u", prefix, luid->high_part, luid->low_part ); @@ -3426,7 +3434,8 @@ static void dump_get_thread_desktop_request( const struct get_thread_desktop_req static void dump_get_thread_desktop_reply( const struct get_thread_desktop_reply *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + dump_obj_locator( " locator=", &req->locator ); + fprintf( stderr, ", handle=%04x", req->handle ); } static void dump_set_thread_desktop_request( const struct set_thread_desktop_request *req ) @@ -3434,6 +3443,11 @@ static void dump_set_thread_desktop_request( const struct set_thread_desktop_req fprintf( stderr, " handle=%04x", req->handle ); } +static void dump_set_thread_desktop_reply( const struct set_thread_desktop_reply *req ) +{ + dump_obj_locator( " locator=", &req->locator ); +} + static void dump_enum_desktop_request( const struct enum_desktop_request *req ) { fprintf( stderr, " winstation=%04x", req->winstation ); @@ -5101,7 +5115,7 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { NULL, NULL, (dump_func)dump_get_thread_desktop_reply, - NULL, + (dump_func)dump_set_thread_desktop_reply, (dump_func)dump_enum_desktop_reply, (dump_func)dump_set_user_object_info_reply, (dump_func)dump_register_hotkey_reply, diff --git a/server/winstation.c b/server/winstation.c index 270720437b0..8136c473815 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -742,10 +742,19 @@ DECL_HANDLER(close_desktop) /* get the thread current desktop */ DECL_HANDLER(get_thread_desktop) { + struct desktop *desktop; struct thread *thread; if (!(thread = get_thread_from_id( req->tid ))) return; reply->handle = thread->desktop; + + if (!(desktop = get_thread_desktop( thread, 0 ))) clear_error(); + else + { + if (desktop->shared) reply->locator = get_shared_object_locator( desktop->shared ); + release_object( desktop ); + } + release_object( thread ); } @@ -788,6 +797,7 @@ DECL_HANDLER(set_thread_desktop) if (old_desktop) remove_desktop_thread( old_desktop, current ); add_desktop_thread( new_desktop, current ); } + reply->locator = get_shared_object_locator( new_desktop->shared ); } if (!current->process->desktop) diff --git a/tools/make_requests b/tools/make_requests index b20b53096ca..36254faec40 100755 --- a/tools/make_requests +++ b/tools/make_requests @@ -53,6 +53,7 @@ my %formats = "generic_map_t" => [ 16, 4, "&dump_generic_map" ], "ioctl_code_t" => [ 4, 4, "&dump_ioctl_code" ], "hw_input_t" => [ 40, 8, "&dump_hw_input" ], + "obj_locator_t" => [ 16, 8, "&dump_obj_locator" ], # varargs-only structures "apc_call_t" => [ 64, 8 ], "context_t" => [ 1728, 8 ],

1 0

Rémi Bernon : include: Add ReadNoFence64 inline helpers.
by Alexandre Julliard June 20, 2024

June 20, 2024

Module: wine Branch: master Commit: f82b1c1fcf770a5d6fa02c3f286282be79a201b8 URL: https://gitlab.winehq.org/wine/wine/-/commit/f82b1c1fcf770a5d6fa02c3f286282… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 16 09:58:53 2023 +0200 include: Add ReadNoFence64 inline helpers. --- include/winnt.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index c4749bf7028..c042afa16c1 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -7082,11 +7082,14 @@ static FORCEINLINE void MemoryBarrier(void) */ #if _MSC_VER >= 1700 #pragma intrinsic(__iso_volatile_load32) +#pragma intrinsic(__iso_volatile_load64) #pragma intrinsic(__iso_volatile_store32) #define __WINE_LOAD32_NO_FENCE(src) (__iso_volatile_load32(src)) +#define __WINE_LOAD64_NO_FENCE(src) (__iso_volatile_load64(src)) #define __WINE_STORE32_NO_FENCE(dest, value) (__iso_volatile_store32(dest, value)) #else /* _MSC_VER >= 1700 */ #define __WINE_LOAD32_NO_FENCE(src) (*(src)) +#define __WINE_LOAD64_NO_FENCE(src) (*(src)) #define __WINE_STORE32_NO_FENCE(dest, value) ((void)(*(dest) = (value))) #endif /* _MSC_VER >= 1700 */ @@ -7120,6 +7123,12 @@ static FORCEINLINE LONG ReadNoFence( LONG const volatile *src ) return value; } +static FORCEINLINE LONG64 ReadNoFence64( LONG64 const volatile *src ) +{ + LONG64 value = __WINE_LOAD64_NO_FENCE( (__int64 const volatile *)src ); + return value; +} + static FORCEINLINE void WriteRelease( LONG volatile *dest, LONG value ) { __wine_memory_barrier_acq_rel(); @@ -7306,6 +7315,13 @@ static FORCEINLINE LONG ReadNoFence( LONG const volatile *src ) return value; } +static FORCEINLINE LONG64 ReadNoFence64( LONG64 const volatile *src ) +{ + LONG64 value; + __WINE_ATOMIC_LOAD_RELAXED( src, &value ); + return value; +} + static FORCEINLINE void WriteRelease( LONG volatile *dest, LONG value ) { __WINE_ATOMIC_STORE_RELEASE( dest, &value );

1 0

Rémi Bernon : server: Create a global session shared mapping.
by Alexandre Julliard June 20, 2024

June 20, 2024

Module: wine Branch: master Commit: fac940dfac314c2b1c120cf9ff8503259153c5a0 URL: https://gitlab.winehq.org/wine/wine/-/commit/fac940dfac314c2b1c120cf9ff8503… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 19 21:38:21 2024 +0100 server: Create a global session shared mapping. --- include/wine/server_protocol.h | 18 ++++++++++++++++- server/directory.c | 7 +++++++ server/file.h | 19 ++++++++++++++++++ server/mapping.c | 45 ++++++++++++++++++++++++++++++++++++++++++ server/object.c | 13 +++++++++++- server/object.h | 2 ++ server/protocol.def | 16 +++++++++++++++ server/request.h | 1 + tools/make_requests | 1 + 9 files changed, 120 insertions(+), 2 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index e16f1ceb7c3..0b5aca33c69 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -29,6 +29,7 @@ typedef unsigned __int64 mem_size_t; typedef unsigned __int64 file_pos_t; typedef unsigned __int64 client_ptr_t; typedef unsigned __int64 affinity_t; +typedef unsigned __int64 object_id_t; typedef client_ptr_t mod_handle_t; struct request_header @@ -882,6 +883,21 @@ struct directory_entry +typedef volatile union +{ + char placeholder; +} object_shm_t; + +typedef volatile struct +{ + LONG64 seq; + object_id_t id; + object_shm_t shm; +} shared_object_t; + + + + struct new_process_request { @@ -6531,7 +6547,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 808 +#define SERVER_PROTOCOL_VERSION 809 /* ### protocol_version end ### */ diff --git a/server/directory.c b/server/directory.c index 8a140309871..b3f055dfd01 100644 --- a/server/directory.c +++ b/server/directory.c @@ -439,11 +439,14 @@ void init_directories( struct fd *intl_fd ) /* mappings */ static const WCHAR intlW[] = {'N','l','s','S','e','c','t','i','o','n','L','A','N','G','_','I','N','T','L'}; static const WCHAR user_dataW[] = {'_','_','w','i','n','e','_','u','s','e','r','_','s','h','a','r','e','d','_','d','a','t','a'}; + static const WCHAR sessionW[] = {'_','_','w','i','n','e','_','s','e','s','s','i','o','n'}; static const struct unicode_str intl_str = {intlW, sizeof(intlW)}; static const struct unicode_str user_data_str = {user_dataW, sizeof(user_dataW)}; + static const struct unicode_str session_str = {sessionW, sizeof(sessionW)}; struct directory *dir_driver, *dir_device, *dir_global, *dir_kernel, *dir_nls; struct object *named_pipe_device, *mailslot_device, *null_device; + struct mapping *session_mapping; unsigned int i; root_directory = create_directory( NULL, NULL, OBJ_PERMANENT, HASH_SIZE, NULL ); @@ -491,6 +494,10 @@ void init_directories( struct fd *intl_fd ) release_object( create_user_data_mapping( &dir_kernel->obj, &user_data_str, OBJ_PERMANENT, NULL )); release_object( intl_fd ); + session_mapping = create_session_mapping( &dir_kernel->obj, &session_str, OBJ_PERMANENT, NULL ); + set_session_mapping( session_mapping ); + release_object( session_mapping ); + release_object( named_pipe_device ); release_object( mailslot_device ); release_object( null_device ); diff --git a/server/file.h b/server/file.h index 7f2d1637863..661e8f9d159 100644 --- a/server/file.h +++ b/server/file.h @@ -188,6 +188,25 @@ extern struct mapping *create_fd_mapping( struct object *root, const struct unic unsigned int attr, const struct security_descriptor *sd ); extern struct object *create_user_data_mapping( struct object *root, const struct unicode_str *name, unsigned int attr, const struct security_descriptor *sd ); +extern struct mapping *create_session_mapping( struct object *root, const struct unicode_str *name, + unsigned int attr, const struct security_descriptor *sd ); +extern void set_session_mapping( struct mapping *mapping ); + +#define SHARED_WRITE_BEGIN( object_shm, type ) \ + do { \ + const type *__shared = (object_shm); \ + type *shared = (type *)__shared; \ + shared_object_t *__obj = CONTAINING_RECORD( shared, shared_object_t, shm ); \ + LONG64 __seq = __obj->seq + 1, __end = __seq + 1; \ + assert( (__seq & 1) != 0 ); \ + __WINE_ATOMIC_STORE_RELEASE( &__obj->seq, &__seq ); \ + do + +#define SHARED_WRITE_END \ + while(0); \ + assert( __seq == __obj->seq ); \ + __WINE_ATOMIC_STORE_RELEASE( &__obj->seq, &__end ); \ + } while(0) /* device functions */ diff --git a/server/mapping.c b/server/mapping.c index ff99b45ce51..6605c111beb 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -225,6 +225,23 @@ static const mem_size_t granularity_mask = 0xffff; static struct addr_range ranges32; static struct addr_range ranges64; +struct session_block +{ + struct list entry; /* entry in the session block list */ + const char *data; /* base pointer for the mmaped data */ +}; + +struct session +{ + struct list blocks; +}; + +static struct mapping *session_mapping; +static struct session session = +{ + .blocks = LIST_INIT(session.blocks), +}; + #define ROUND_SIZE(size) (((size) + page_mask) & ~page_mask) void init_memory(void) @@ -1256,6 +1273,34 @@ int get_page_size(void) return page_mask + 1; } +struct mapping *create_session_mapping( struct object *root, const struct unicode_str *name, + unsigned int attr, const struct security_descriptor *sd ) +{ + static const unsigned int access = FILE_READ_DATA | FILE_WRITE_DATA; + mem_size_t size = max( sizeof(shared_object_t) * 512, 0x10000 ); + + return create_mapping( root, name, attr, size, SEC_COMMIT, 0, access, sd ); +} + +void set_session_mapping( struct mapping *mapping ) +{ + int unix_fd = get_unix_fd( mapping->fd ); + mem_size_t size = mapping->size; + struct session_block *block; + void *tmp; + + if (!(block = mem_alloc( sizeof(*block) ))) return; + if ((tmp = mmap( NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, unix_fd, 0 )) == MAP_FAILED) + { + free( block ); + return; + } + + block->data = tmp; + session_mapping = mapping; + list_add_tail( &session.blocks, &block->entry ); +} + struct object *create_user_data_mapping( struct object *root, const struct unicode_str *name, unsigned int attr, const struct security_descriptor *sd ) { diff --git a/server/object.c b/server/object.c index 459ead5f3a5..3b72b576d50 100644 --- a/server/object.c +++ b/server/object.c @@ -102,8 +102,19 @@ void close_objects(void) /*****************************************************************/ +/* mark a block of memory as not accessible for debugging purposes */ +void mark_block_noaccess( void *ptr, size_t size ) +{ + memset( ptr, 0xfe, size ); +#if defined(VALGRIND_MAKE_MEM_NOACCESS) + VALGRIND_DISCARD( VALGRIND_MAKE_MEM_NOACCESS( ptr, size ) ); +#elif defined(VALGRIND_MAKE_NOACCESS) + VALGRIND_DISCARD( VALGRIND_MAKE_NOACCESS( ptr, size ) ); +#endif +} + /* mark a block of memory as uninitialized for debugging purposes */ -static inline void mark_block_uninitialized( void *ptr, size_t size ) +void mark_block_uninitialized( void *ptr, size_t size ) { memset( ptr, 0x55, size ); #if defined(VALGRIND_MAKE_MEM_UNDEFINED) diff --git a/server/object.h b/server/object.h index d4d66536b81..2337ee88231 100644 --- a/server/object.h +++ b/server/object.h @@ -139,6 +139,8 @@ struct wait_queue_entry struct thread_wait *wait; }; +extern void mark_block_noaccess( void *ptr, size_t size ); +extern void mark_block_uninitialized( void *ptr, size_t size ); extern void *mem_alloc( size_t size ) __WINE_ALLOC_SIZE(1) __WINE_DEALLOC(free) __WINE_MALLOC; extern void *memdup( const void *data, size_t len ) __WINE_ALLOC_SIZE(2) __WINE_DEALLOC(free); extern void *alloc_object( const struct object_ops *ops ); diff --git a/server/protocol.def b/server/protocol.def index 766674d3e30..aad95db1195 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -45,6 +45,7 @@ typedef unsigned __int64 mem_size_t; typedef unsigned __int64 file_pos_t; typedef unsigned __int64 client_ptr_t; typedef unsigned __int64 affinity_t; +typedef unsigned __int64 object_id_t; typedef client_ptr_t mod_handle_t; struct request_header @@ -895,6 +896,21 @@ struct directory_entry /* VARARG(type,unicode_str,type_len); */ }; +/****************************************************************/ +/* shared session mapping structures */ + +typedef volatile union +{ + char placeholder; +} object_shm_t; + +typedef volatile struct +{ + LONG64 seq; /* sequence number - server updating if (seq & 1) != 0 */ + object_id_t id; /* object unique id, object data is valid if != 0 */ + object_shm_t shm; /* object shared data */ +} shared_object_t; + /****************************************************************/ /* Request declarations */ diff --git a/server/request.h b/server/request.h index 67de9bb1779..fe323d4785a 100644 --- a/server/request.h +++ b/server/request.h @@ -721,6 +721,7 @@ C_ASSERT( sizeof(mem_size_t) == 8 ); C_ASSERT( sizeof(message_data_t) == 48 ); C_ASSERT( sizeof(mod_handle_t) == 8 ); C_ASSERT( sizeof(obj_handle_t) == 4 ); +C_ASSERT( sizeof(object_id_t) == 8 ); C_ASSERT( sizeof(pe_image_info_t) == 88 ); C_ASSERT( sizeof(process_id_t) == 4 ); C_ASSERT( sizeof(property_data_t) == 16 ); diff --git a/tools/make_requests b/tools/make_requests index 419b1264ea4..b20b53096ca 100755 --- a/tools/make_requests +++ b/tools/make_requests @@ -42,6 +42,7 @@ my %formats = "file_pos_t" => [ 8, 8, "&dump_uint64" ], "mem_size_t" => [ 8, 8, "&dump_uint64" ], "affinity_t" => [ 8, 8, "&dump_uint64" ], + "object_id_t" => [ 8, 8, "&dump_uint64" ], "timeout_t" => [ 8, 8, "&dump_timeout" ], "abstime_t" => [ 8, 8, "&dump_abstime" ], "rectangle_t" => [ 16, 4, "&dump_rectangle" ],

1 0

Eric Pouech : cmd: Test input has been read before using it.
by Alexandre Julliard June 20, 2024

June 20, 2024

Module: wine Branch: master Commit: 96d682e5f7b0c68b645beec9daf5d4eabac9353e URL: https://gitlab.winehq.org/wine/wine/-/commit/96d682e5f7b0c68b645beec9daf5d4… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Jun 4 12:15:17 2024 +0200 cmd: Test input has been read before using it. This let confirmations fail when reading from NUL (instead of looping forever). Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/builtins.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index d911f851976..04c879bc18b 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -228,7 +228,7 @@ static BOOL WCMD_ask_confirm (const WCHAR *message, BOOL showSureText, if (showSureText) WCMD_output_asis (confirm); WCMD_output_asis (options); - if (!WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), answer, ARRAY_SIZE(answer), &count)) + if (!WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), answer, ARRAY_SIZE(answer), &count) || !count) return FALSE; answer[0] = towupper(answer[0]); if (answer[0] == Ybuffer[0])

1 0

Eric Pouech : cmd: Fix delayed expansion in FOR loop on file sets.
by Alexandre Julliard June 20, 2024

June 20, 2024

Module: wine Branch: master Commit: f98077591f7d18f60c4ec6685027b987c75c1724 URL: https://gitlab.winehq.org/wine/wine/-/commit/f98077591f7d18f60c4ec6685027b9… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Jun 18 10:11:13 2024 +0200 cmd: Fix delayed expansion in FOR loop on file sets. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/tests/test_builtins.cmd.exp | 4 ++-- programs/cmd/wcmdmain.c | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 84637ce41e3..1564e6c4611 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -610,8 +610,8 @@ N '' '.eh'@or_broken@'' "foo bar" -(a)todo_wine@foo -(a)todo_wine@bar +foo +bar --- in digit variables a %1 %2 b %1 %2 diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index ec71e760348..f2030d7e985 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -3255,6 +3255,7 @@ static CMD_NODE *for_control_execute_set(CMD_FOR_CONTROL *for_ctrl, const WCHAR len = 0; wcscpy(set, for_ctrl->set); + handleExpansion(set, context != NULL, delayedsubst); for (i = 0; ; i++) { WCHAR *element = WCMD_parameter(set, i, NULL, TRUE, FALSE); @@ -3314,7 +3315,11 @@ static CMD_NODE *for_control_execute_walk_files(CMD_FOR_CONTROL *for_ctrl, CMD_N if (for_ctrl->root_dir) { - dirs_to_walk = WCMD_dir_stack_create(for_ctrl->root_dir, NULL); + WCHAR buffer[MAXSTRING]; + + wcscpy(buffer, for_ctrl->root_dir); + handleExpansion(buffer, context != NULL, delayedsubst); + dirs_to_walk = WCMD_dir_stack_create(buffer, NULL); } else dirs_to_walk = WCMD_dir_stack_create(NULL, NULL); ref_len = wcslen(dirs_to_walk->dirName);

1 0

Eric Pouech : cmd: Remove old FOR loop related code.
by Alexandre Julliard June 20, 2024

June 20, 2024

Module: wine Branch: master Commit: 96762f12e7590419a90d43daf3b9659aa8e8f2fe URL: https://gitlab.winehq.org/wine/wine/-/commit/96762f12e7590419a90d43daf3b965… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Fri Jun 14 18:02:24 2024 +0200 cmd: Remove old FOR loop related code. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/builtins.c | 683 +----------------------------------------------- programs/cmd/wcmdmain.c | 1 + 2 files changed, 2 insertions(+), 682 deletions(-)

1 0

Eric Pouech : cmd: Split parsing from executing FOR loops for file walking.
by Alexandre Julliard June 20, 2024

June 20, 2024

Module: wine Branch: master Commit: 0ca28d3a70dd17eccc5d9868789fd1c5bf7e2394 URL: https://gitlab.winehq.org/wine/wine/-/commit/0ca28d3a70dd17eccc5d9868789fd1… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Fri Jun 14 17:39:40 2024 +0200 cmd: Split parsing from executing FOR loops for file walking. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/builtins.c | 6 +-- programs/cmd/wcmd.h | 12 ++++- programs/cmd/wcmdmain.c | 141 ++++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 151 insertions(+), 8 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 86248231363..82ba8088b02 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -153,7 +153,7 @@ static struct {' ',' '} }; -static DIRECTORY_STACK *WCMD_dir_stack_create(const WCHAR *dir, const WCHAR *file) +DIRECTORY_STACK *WCMD_dir_stack_create(const WCHAR *dir, const WCHAR *file) { DIRECTORY_STACK *new = xalloc(sizeof(DIRECTORY_STACK)); @@ -177,7 +177,7 @@ static DIRECTORY_STACK *WCMD_dir_stack_create(const WCHAR *dir, const WCHAR *fil return new; } -static DIRECTORY_STACK *WCMD_dir_stack_free(DIRECTORY_STACK *dir) +DIRECTORY_STACK *WCMD_dir_stack_free(DIRECTORY_STACK *dir) { DIRECTORY_STACK *next; @@ -1790,7 +1790,7 @@ static BOOL WCMD_parse_forf_options(WCHAR *options, WCHAR *eol, int *skip, * processed, and any other directory still to be processed, mimicking what * Windows does */ -static void WCMD_add_dirstowalk(DIRECTORY_STACK *dirsToWalk) +void WCMD_add_dirstowalk(DIRECTORY_STACK *dirsToWalk) { DIRECTORY_STACK *remainingDirs = dirsToWalk; WCHAR fullitem[MAX_PATH]; diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index c1a95c6223c..fd2b541c830 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -83,16 +83,20 @@ typedef struct _CMD_IF_CONDITION }; } CMD_IF_CONDITION; +#define CMD_FOR_FLAG_TREE_RECURSE (1u << 0) +#define CMD_FOR_FLAG_TREE_INCLUDE_FILES (1u << 1) +#define CMD_FOR_FLAG_TREE_INCLUDE_DIRECTORIES (1u << 2) + typedef struct _CMD_FOR_CONTROL { - enum for_control_operator { - CMD_FOR_FILE_SET /* /F */, + enum for_control_operator {CMD_FOR_FILETREE, CMD_FOR_FILE_SET /* /F */, CMD_FOR_NUMBERS /* /L */} operator; unsigned flags; /* |-ed CMD_FOR_FLAG_* */ int variable_index; const WCHAR *set; union { + const WCHAR *root_dir; /* for CMD_FOR_FILETREE */ struct /* for CMD_FOR_FILE_SET */ { WCHAR eol; @@ -164,6 +168,10 @@ int WCMD_for_nexttoken(int lasttoken, const WCHAR *tokenstr, BOOL *duplicates); void WCMD_part_execute(CMD_NODE **cmdList, const WCHAR *firstcmd, BOOL isIF, BOOL executecmds); +struct _DIRECTORY_STACK; +void WCMD_add_dirstowalk(struct _DIRECTORY_STACK *dirsToWalk); +struct _DIRECTORY_STACK *WCMD_dir_stack_create(const WCHAR *dir, const WCHAR *file); +struct _DIRECTORY_STACK *WCMD_dir_stack_free(struct _DIRECTORY_STACK *dir); void WCMD_assoc (const WCHAR *, BOOL); void WCMD_batch (WCHAR *, WCHAR *, BOOL, WCHAR *, HANDLE); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 9bce77b19df..ec71e760348 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1000,6 +1000,9 @@ void for_control_dispose(CMD_FOR_CONTROL *for_ctrl) free((void*)for_ctrl->delims); free((void*)for_ctrl->tokens); break; + case CMD_FOR_FILETREE: + free((void*)for_ctrl->root_dir); + break; default: break; } @@ -1007,7 +1010,7 @@ void for_control_dispose(CMD_FOR_CONTROL *for_ctrl) const char *debugstr_for_control(const CMD_FOR_CONTROL *for_ctrl) { - static const char* for_ctrl_strings[] = {"file", "numbers"}; + static const char* for_ctrl_strings[] = {"tree", "file", "numbers"}; const char *flags, *options; if (for_ctrl->operator >= ARRAY_SIZE(for_ctrl_strings)) @@ -1016,9 +1019,18 @@ const char *debugstr_for_control(const CMD_FOR_CONTROL *for_ctrl) return wine_dbg_sprintf("<<%u>>", for_ctrl->operator); } - flags = ""; + if (for_ctrl->flags) + flags = wine_dbg_sprintf("flags=%s%s%s ", + (for_ctrl->flags & CMD_FOR_FLAG_TREE_RECURSE) ? "~recurse" : "", + (for_ctrl->flags & CMD_FOR_FLAG_TREE_INCLUDE_FILES) ? "~+files" : "", + (for_ctrl->flags & CMD_FOR_FLAG_TREE_INCLUDE_DIRECTORIES) ? "~+dirs" : ""); + else + flags = ""; switch (for_ctrl->operator) { + case CMD_FOR_FILETREE: + options = wine_dbg_sprintf("root=(%ls) ", for_ctrl->root_dir); + break; case CMD_FOR_FILE_SET: { WCHAR eol_buf[4] = {L'\'', for_ctrl->eol, L'\'', L'\0'}; @@ -1045,6 +1057,9 @@ void for_control_create(enum for_control_operator for_op, unsigned flags, const for_ctrl->set = NULL; switch (for_ctrl->operator) { + case CMD_FOR_FILETREE: + for_ctrl->root_dir = options && *options ? xstrdupW(options) : NULL; + break; default: break; } @@ -2239,6 +2254,22 @@ CMD_FOR_CONTROL *for_control_parse(WCHAR *opts_var) } switch (mode) { + case L' ': + for_op = CMD_FOR_FILETREE; + flags = CMD_FOR_FLAG_TREE_INCLUDE_FILES; + break; + case L'D': + for_op = CMD_FOR_FILETREE; + flags = CMD_FOR_FLAG_TREE_INCLUDE_DIRECTORIES; + break; + case L'X': + for_op = CMD_FOR_FILETREE; + flags = CMD_FOR_FLAG_TREE_INCLUDE_DIRECTORIES | CMD_FOR_FLAG_TREE_RECURSE; + break; + case L'R': + for_op = CMD_FOR_FILETREE; + flags = CMD_FOR_FLAG_TREE_INCLUDE_FILES | /*CMD_FOR_FLAG_TREE_INCLUDE_DIRECTORIES | */CMD_FOR_FLAG_TREE_RECURSE; + break; case L'L': for_op = CMD_FOR_NUMBERS; break; @@ -2249,7 +2280,7 @@ CMD_FOR_CONTROL *for_control_parse(WCHAR *opts_var) return NULL; } - if (mode == L'F') + if (mode == L'F' || mode == L'R') { /* Retrieve next parameter to see if is root/options (raw form required * with for /f, or unquoted in for /r) @@ -3205,6 +3236,104 @@ static CMD_NODE *for_control_execute_fileset(CMD_FOR_CONTROL *for_ctrl, CMD_NODE return body; } +static CMD_NODE *for_control_execute_set(CMD_FOR_CONTROL *for_ctrl, const WCHAR *from_dir, size_t ref_len, CMD_NODE *cmdList) +{ + CMD_NODE *body = NULL; + size_t len; + WCHAR set[MAXSTRING]; + WCHAR buffer[MAX_PATH]; + int i; + + if (from_dir) + { + len = wcslen(from_dir) + 1; + if (len >= ARRAY_SIZE(buffer)) return NULL; + wcscpy(buffer, from_dir); + wcscat(buffer, L"\\"); + } + else + len = 0; + + wcscpy(set, for_ctrl->set); + for (i = 0; ; i++) + { + WCHAR *element = WCMD_parameter(set, i, NULL, TRUE, FALSE); + if (!element || !*element) break; + if (len + wcslen(element) + 1 >= ARRAY_SIZE(buffer)) continue; + + wcscpy(&buffer[len], element); + + TRACE("Doing set element %ls\n", buffer); + + if (wcspbrk(element, L"?*")) + { + WIN32_FIND_DATAW fd; + HANDLE hff = FindFirstFileW(buffer, &fd); + size_t insert_pos = (wcsrchr(buffer, L'\\') ? wcsrchr(buffer, L'\\') + 1 - buffer : 0); + + if (hff == INVALID_HANDLE_VALUE) + { + TRACE("Couldn't FindFirstFile on %ls\n", buffer); + continue; + } + do + { + TRACE("Considering %ls\n", fd.cFileName); + if (!lstrcmpW(fd.cFileName, L"..") || !lstrcmpW(fd.cFileName, L".")) continue; + if (!(for_ctrl->flags & CMD_FOR_FLAG_TREE_INCLUDE_FILES) && + !(fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) + continue; + if (!(for_ctrl->flags & CMD_FOR_FLAG_TREE_INCLUDE_DIRECTORIES) && + (fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) + continue; + + if (insert_pos + wcslen(fd.cFileName) + 1 >= ARRAY_SIZE(buffer)) continue; + wcscpy(&buffer[insert_pos], fd.cFileName); + + body = cmdList; + WCMD_set_for_loop_variable(for_ctrl->variable_index, buffer); + WCMD_part_execute(&body, CMD_node_get_command(body)->command + 3, FALSE, TRUE); + } while (FindNextFileW(hff, &fd) != 0); + FindClose(hff); + } + else + { + body = cmdList; + WCMD_set_for_loop_variable(for_ctrl->variable_index, buffer); + WCMD_part_execute(&body, CMD_node_get_command(body)->command + 3, FALSE, TRUE); + } + } + return body; +} + +static CMD_NODE *for_control_execute_walk_files(CMD_FOR_CONTROL *for_ctrl, CMD_NODE *cmdList) +{ + DIRECTORY_STACK *dirs_to_walk; + size_t ref_len; + CMD_NODE *body = NULL; + + if (for_ctrl->root_dir) + { + dirs_to_walk = WCMD_dir_stack_create(for_ctrl->root_dir, NULL); + } + else dirs_to_walk = WCMD_dir_stack_create(NULL, NULL); + ref_len = wcslen(dirs_to_walk->dirName); + + while (dirs_to_walk) + { + TRACE("About to walk %p %ls for %s\n", dirs_to_walk, dirs_to_walk->dirName, debugstr_for_control(for_ctrl)); + if (for_ctrl->flags & CMD_FOR_FLAG_TREE_RECURSE) + WCMD_add_dirstowalk(dirs_to_walk); + + body = for_control_execute_set(for_ctrl, dirs_to_walk->dirName, ref_len, cmdList); + /* If we are walking directories, move on to any which remain */ + dirs_to_walk = WCMD_dir_stack_free(dirs_to_walk); + } + TRACE("Finished all directories.\n"); + + return body; +} + static CMD_NODE *for_control_execute_numbers(CMD_FOR_CONTROL *for_ctrl, CMD_NODE *cmdList) { WCHAR set[MAXSTRING]; @@ -3250,6 +3379,12 @@ void for_control_execute(CMD_FOR_CONTROL *for_ctrl, CMD_NODE **cmdList) switch (for_ctrl->operator) { + case CMD_FOR_FILETREE: + if (for_ctrl->flags & CMD_FOR_FLAG_TREE_RECURSE) + last = for_control_execute_walk_files(for_ctrl, *cmdList); + else + last = for_control_execute_set(for_ctrl, NULL, 0, *cmdList); + break; case CMD_FOR_FILE_SET: last = for_control_execute_fileset(for_ctrl, *cmdList); break;

1 0

Alexandre Julliard : ntdll: Send cross-process notification in memory functions on ARM64EC.
by Alexandre Julliard June 20, 2024

June 20, 2024

Module: wine Branch: master Commit: b7a3023ca1ec5938b6713dc1b71bc5cbcf0096da URL: https://gitlab.winehq.org/wine/wine/-/commit/b7a3023ca1ec5938b6713dc1b71bc5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 20 15:44:58 2024 +0200 ntdll: Send cross-process notification in memory functions on ARM64EC. Copied from the corresponding code in wow64.dll. --- dlls/ntdll/signal_arm64ec.c | 124 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 119 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index 70d9884750d..2e974d389e1 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -52,6 +52,41 @@ static inline BOOL is_valid_arm64ec_frame( ULONG_PTR frame ) frame <= get_arm64ec_cpu_area()->EmulatorStackBase); } + +/********************************************************************** + * send_cross_process_notification + */ +static BOOL send_cross_process_notification( HANDLE process, UINT id, const void *addr, SIZE_T size, + int nb_args, ... ) +{ + CROSS_PROCESS_WORK_LIST *list; + CROSS_PROCESS_WORK_ENTRY *entry; + void *unused; + HANDLE section; + va_list args; + int i; + + RtlOpenCrossProcessEmulatorWorkConnection( process, &section, (void **)&list ); + if (!list) return FALSE; + 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 ); + } + NtUnmapViewOfSection( GetCurrentProcess(), list ); + NtClose( section ); + return TRUE; +} + + /******************************************************************* * syscalls */ @@ -84,8 +119,8 @@ DEFINE_SYSCALL(NtAlertThread, (HANDLE handle)) DEFINE_SYSCALL(NtAlertThreadByThreadId, (HANDLE tid)) DEFINE_SYSCALL(NtAllocateLocallyUniqueId, (LUID *luid)) DEFINE_SYSCALL(NtAllocateUuids, (ULARGE_INTEGER *time, ULONG *delta, ULONG *sequence, UCHAR *seed)) -DEFINE_SYSCALL(NtAllocateVirtualMemory, (HANDLE process, PVOID *ret, ULONG_PTR zero_bits, SIZE_T *size_ptr, ULONG type, ULONG protect)) -DEFINE_SYSCALL(NtAllocateVirtualMemoryEx, (HANDLE process, PVOID *ret, SIZE_T *size_ptr, ULONG type, ULONG protect, MEM_EXTENDED_PARAMETER *parameters, ULONG count)) +DEFINE_WRAPPED_SYSCALL(NtAllocateVirtualMemory, (HANDLE process, PVOID *ret, ULONG_PTR zero_bits, SIZE_T *size_ptr, ULONG type, ULONG protect)) +DEFINE_WRAPPED_SYSCALL(NtAllocateVirtualMemoryEx, (HANDLE process, PVOID *ret, SIZE_T *size_ptr, ULONG type, ULONG protect, MEM_EXTENDED_PARAMETER *parameters, ULONG count)) DEFINE_SYSCALL(NtAreMappedFilesTheSame, (PVOID addr1, PVOID addr2)) DEFINE_SYSCALL(NtAssignProcessToJobObject, (HANDLE job, HANDLE process)) DEFINE_SYSCALL(NtCallbackReturn, (void *ret_ptr, ULONG ret_len, NTSTATUS status)) @@ -141,11 +176,11 @@ DEFINE_SYSCALL(NtEnumerateValueKey, (HANDLE handle, ULONG index, KEY_VALUE_INFOR DEFINE_SYSCALL(NtFilterToken, (HANDLE token, ULONG flags, TOKEN_GROUPS *disable_sids, TOKEN_PRIVILEGES *privileges, TOKEN_GROUPS *restrict_sids, HANDLE *new_token)) DEFINE_SYSCALL(NtFindAtom, (const WCHAR *name, ULONG length, RTL_ATOM *atom)) DEFINE_SYSCALL(NtFlushBuffersFile, (HANDLE handle, IO_STATUS_BLOCK *io)) -DEFINE_SYSCALL(NtFlushInstructionCache, (HANDLE handle, const void *addr, SIZE_T size)) +DEFINE_WRAPPED_SYSCALL(NtFlushInstructionCache, (HANDLE handle, const void *addr, SIZE_T size)) DEFINE_SYSCALL(NtFlushKey, (HANDLE key)) DEFINE_SYSCALL(NtFlushProcessWriteBuffers, (void)) DEFINE_SYSCALL(NtFlushVirtualMemory, (HANDLE process, LPCVOID *addr_ptr, SIZE_T *size_ptr, ULONG unknown)) -DEFINE_SYSCALL(NtFreeVirtualMemory, (HANDLE process, PVOID *addr_ptr, SIZE_T *size_ptr, ULONG type)) +DEFINE_WRAPPED_SYSCALL(NtFreeVirtualMemory, (HANDLE process, PVOID *addr_ptr, SIZE_T *size_ptr, ULONG type)) DEFINE_SYSCALL(NtFsControlFile, (HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc_context, IO_STATUS_BLOCK *io, ULONG code, void *in_buffer, ULONG in_size, void *out_buffer, ULONG out_size)) DEFINE_WRAPPED_SYSCALL(NtGetContextThread, (HANDLE handle, ARM64_NT_CONTEXT *context)) DEFINE_SYSCALL_(ULONG, NtGetCurrentProcessorNumber, (void)) @@ -193,7 +228,7 @@ DEFINE_SYSCALL(NtOpenThreadTokenEx, (HANDLE thread, DWORD access, BOOLEAN self, DEFINE_SYSCALL(NtOpenTimer, (HANDLE *handle, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr)) DEFINE_SYSCALL(NtPowerInformation, (POWER_INFORMATION_LEVEL level, void *input, ULONG in_size, void *output, ULONG out_size)) DEFINE_SYSCALL(NtPrivilegeCheck, (HANDLE token, PRIVILEGE_SET *privs, BOOLEAN *res)) -DEFINE_SYSCALL(NtProtectVirtualMemory, (HANDLE process, PVOID *addr_ptr, SIZE_T *size_ptr, ULONG new_prot, ULONG *old_prot)) +DEFINE_WRAPPED_SYSCALL(NtProtectVirtualMemory, (HANDLE process, PVOID *addr_ptr, SIZE_T *size_ptr, ULONG new_prot, ULONG *old_prot)) DEFINE_SYSCALL(NtPulseEvent, (HANDLE handle, LONG *prev_state)) DEFINE_SYSCALL(NtQueryAttributesFile, (const OBJECT_ATTRIBUTES *attr, FILE_BASIC_INFORMATION *info)) DEFINE_SYSCALL(NtQueryDefaultLocale, (BOOLEAN user, LCID *lcid)) @@ -311,6 +346,42 @@ DEFINE_SYSCALL(NtYieldExecution, (void)) DEFINE_SYSCALL(wine_nt_to_unix_file_name, (const OBJECT_ATTRIBUTES *attr, char *nameA, ULONG *size, UINT disposition)) DEFINE_SYSCALL(wine_unix_to_nt_file_name, (const char *name, WCHAR *buffer, ULONG *size)) +NTSTATUS SYSCALL_API NtAllocateVirtualMemory( HANDLE process, PVOID *ret, ULONG_PTR zero_bits, + SIZE_T *size_ptr, ULONG type, ULONG protect ) +{ + BOOL is_current = RtlIsCurrentProcess( process ); + NTSTATUS status; + + if (!*ret && (type & MEM_COMMIT)) type |= MEM_RESERVE; + + if (!is_current) send_cross_process_notification( process, CrossProcessPreVirtualAlloc, + *ret, *size_ptr, 3, type, protect, 0 ); + + status = syscall_NtAllocateVirtualMemory( process, ret, zero_bits, size_ptr, type, protect ); + + if (!is_current) send_cross_process_notification( process, CrossProcessPostVirtualAlloc, + *ret, *size_ptr, 3, type, protect, status ); + return status; +} + +NTSTATUS SYSCALL_API NtAllocateVirtualMemoryEx( HANDLE process, PVOID *ret, SIZE_T *size_ptr, ULONG type, + ULONG protect, MEM_EXTENDED_PARAMETER *parameters, ULONG count ) +{ + BOOL is_current = RtlIsCurrentProcess( process ); + NTSTATUS status; + + if (!*ret && (type & MEM_COMMIT)) type |= MEM_RESERVE; + + if (!is_current) send_cross_process_notification( process, CrossProcessPreVirtualAlloc, + *ret, *size_ptr, 3, type, protect, 0 ); + + status = syscall_NtAllocateVirtualMemoryEx( process, ret, size_ptr, type, protect, parameters, count ); + + if (!is_current) send_cross_process_notification( process, CrossProcessPostVirtualAlloc, + *ret, *size_ptr, 3, type, protect, status ); + return status; +} + NTSTATUS SYSCALL_API NtContinue( CONTEXT *context, BOOLEAN alertable ) { ARM64_NT_CONTEXT arm_ctx; @@ -319,6 +390,33 @@ NTSTATUS SYSCALL_API NtContinue( CONTEXT *context, BOOLEAN alertable ) return syscall_NtContinue( &arm_ctx, alertable ); } +NTSTATUS SYSCALL_API NtFlushInstructionCache( HANDLE process, const void *addr, SIZE_T size ) +{ + NTSTATUS status = syscall_NtFlushInstructionCache( process, addr, size ); + + if (!status) + { + if (!RtlIsCurrentProcess( process )) + send_cross_process_notification( process, CrossProcessFlushCache, addr, size, 0 ); + } + return status; +} + +NTSTATUS SYSCALL_API NtFreeVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T *size_ptr, ULONG type ) +{ + BOOL is_current = RtlIsCurrentProcess( process ); + NTSTATUS status; + + if (!is_current) send_cross_process_notification( process, CrossProcessPreVirtualFree, + *addr_ptr, *size_ptr, 2, type, 0 ); + + status = syscall_NtFreeVirtualMemory( process, addr_ptr, size_ptr, type ); + + if (!is_current) send_cross_process_notification( process, CrossProcessPostVirtualFree, + *addr_ptr, *size_ptr, 2, type, status ); + return status; +} + NTSTATUS SYSCALL_API NtGetContextThread( HANDLE handle, CONTEXT *context ) { ARM64_NT_CONTEXT arm_ctx = { .ContextFlags = ctx_flags_x64_to_arm( context->ContextFlags ) }; @@ -328,6 +426,22 @@ NTSTATUS SYSCALL_API NtGetContextThread( HANDLE handle, CONTEXT *context ) return status; } +NTSTATUS SYSCALL_API NtProtectVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T *size_ptr, + ULONG new_prot, ULONG *old_prot ) +{ + BOOL is_current = RtlIsCurrentProcess( process ); + NTSTATUS status; + + if (!is_current) send_cross_process_notification( process, CrossProcessPreVirtualProtect, + *addr_ptr, *size_ptr, 2, new_prot, 0 ); + + status = syscall_NtProtectVirtualMemory( process, addr_ptr, size_ptr, new_prot, old_prot ); + + if (!is_current) send_cross_process_notification( process, CrossProcessPostVirtualProtect, + *addr_ptr, *size_ptr, 2, new_prot, status ); + return status; +} + NTSTATUS SYSCALL_API NtRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL first_chance ) { ARM64_NT_CONTEXT arm_ctx;

1 0

Alexandre Julliard : ntdll: Fix the fake 32-bit %cs value on ARM64EC.
by Alexandre Julliard June 20, 2024

June 20, 2024

Module: wine Branch: master Commit: 0d5936563dae36c8accbf995fbd4632b974c8763 URL: https://gitlab.winehq.org/wine/wine/-/commit/0d5936563dae36c8accbf995fbd463… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 20 16:17:01 2024 +0200 ntdll: Fix the fake 32-bit %cs value on ARM64EC. --- dlls/ntdll/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 102e0c930a9..16bc445b7f9 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -249,7 +249,7 @@ NTSTATUS WINAPI RtlWow64GetThreadSelectorEntry( HANDLE handle, THREAD_DESCRIPTOR { /* hardcoded values */ #ifdef __arm64ec__ - context.SegCs = 0x33; + context.SegCs = 0x23; context.SegSs = 0x2b; context.SegFs = 0x53; #elif defined(__x86_64__)

1 0

Ziqing Hui : mf/tests: Add tests for H264 encoder types.
by Alexandre Julliard June 20, 2024

June 20, 2024

Module: wine Branch: master Commit: 9dfc402cc34d1c0830f35dee031468b5590271b4 URL: https://gitlab.winehq.org/wine/wine/-/commit/9dfc402cc34d1c0830f35dee031468… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Jun 5 10:55:23 2024 +0800 mf/tests: Add tests for H264 encoder types. --- dlls/mf/tests/transform.c | 111 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 86 insertions(+), 25 deletions(-)

1 0