[PATCH 0/1] MR2618: ntdll: Increment offset by len in build_clr_surrogate_section.

[Alex Henrie (＠alexhenrie)]

Instead of multiplying it by 2. I don't know how this ever worked.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54808

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

[PATCH 1/1] ntdll: Increment offset by len in build_clr_surrogate_section.

[Alex Henrie]

From: Alex Henrie <alexhenrie24(a)gmail.com>

Instead of multiplying it by 2. I don't know how this ever worked.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54808
---
 dlls/ntdll/actctx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c
index b275a7f5b49..3fcf5196339 100644
--- a/dlls/ntdll/actctx.c
+++ b/dlls/ntdll/actctx.c
@@ -4819,7 +4819,7 @@ static NTSTATUS build_clr_surrogate_section(ACTIVATION_CONTEXT* actctx, struct g
                     ptrW[data->version_len/sizeof(WCHAR)] = 0;
                 }
 
-                data_offset += index->data_offset;
+                data_offset += index->data_len;
                 index++;
             }
         }
-- 
GitLab

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

[Nikolay Sivov (＠nsivov)]

Please add a kernel32 tests to trigger this. I think we only test a single entry, and that's why next offset does not matter for tests.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/2618#note_29415

[Nikolay Sivov (＠nsivov)]

Actually, I don't see any test breakage with 7 records so far without this fix. Maybe we should test guid index fields as well, I think that was easy to expose since whole section pointer is returned.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/2618#note_29416