[PATCH v2 0/2] MR9385: server: Fix Mach vm region info datatype in write_process_memory().

[Marc-Aurel Zent (＠mzent)]

Fixes the issue found here: https://gitlab.winehq.org/wine/wine/-/merge_requests/8834#note_120929.

--
  v2: server: Correctly report partial write size in Mach write_process_memory().
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/9385

[PATCH v2 1/2] server: Fix Mach vm region info datatype in write_process_memory().

[Marc-Aurel Zent]

From: Marc-Aurel Zent <mzent(a)codeweavers.com>

---
 server/mach.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/mach.c b/server/mach.c
index de8c0eef9b9..7675835426a 100644
--- a/server/mach.c
+++ b/server/mach.c
@@ -453,7 +453,7 @@ int write_process_memory( struct process *process, client_ptr_t ptr, data_size_t
         mach_vm_address_t current_address = (mach_vm_address_t)ptr;
         mach_vm_address_t region_address = current_address;
         mach_vm_size_t region_size, write_size;
-        vm_region_basic_info_data_t info;
+        vm_region_basic_info_data_64_t info;
         mach_msg_type_number_t info_count = VM_REGION_BASIC_INFO_COUNT_64;
         mach_port_t object_name;
         data_size_t remaining_size = size;
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/9385

[PATCH v2 2/2] server: Correctly report partial write size in Mach write_process_memory().

[Marc-Aurel Zent]

From: Marc-Aurel Zent <mzent(a)codeweavers.com>

---
 server/mach.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/server/mach.c b/server/mach.c
index 7675835426a..0f75d892816 100644
--- a/server/mach.c
+++ b/server/mach.c
@@ -422,6 +422,8 @@ int write_process_memory( struct process *process, client_ptr_t ptr, data_size_t
     mach_port_t process_port = get_process_port( process );
     mach_vm_offset_t data;
 
+    if (written) *written = 0;
+
     if (!process_port)
     {
         set_error( STATUS_ACCESS_DENIED );
@@ -529,8 +531,9 @@ int write_process_memory( struct process *process, client_ptr_t ptr, data_size_t
                     info.protection );
             if (ret != KERN_SUCCESS) break;
 
-            current_address += write_size;
-            remaining_size  -= write_size;
+            if (written) *written += write_size;
+            current_address       += write_size;
+            remaining_size        -= write_size;
         }
 
         task_resume( process_port );
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/9385