From: Alex Henrie <alexhenrie24(a)gmail.com> Instead of multiplying it by 2. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54808 --- dlls/kernel32/tests/actctx.c | 5 +++++ dlls/ntdll/actctx.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index ff1a6ac4109..6e026ec0d72 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -147,6 +147,11 @@ static const char manifest3[] = " name=\"testsurrogate\"" " runtimeVersion=\"v2.0.50727\"" " />" +" <clrSurrogate " +" clsid=\"{96666666-8888-7777-6666-555555555556}\"" +" name=\"testsurrogate\"" +" runtimeVersion=\"v2.0.50727\"" +" />" " <clrClass " " clsid=\"{22345678-1234-5678-1234-111122223333}\"" " name=\"clrclass\"" 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