Module: wine Branch: master Commit: bcf52b7c64f40fc3c1700466e84905d379c0b316 URL: https://gitlab.winehq.org/wine/wine/-/commit/bcf52b7c64f40fc3c1700466e84905d...
Author: Alexandre Julliard julliard@winehq.org Date: Fri Sep 9 15:41:14 2022 +0200
ntdll: Use a different alignment for initial process parameters.
---
dlls/ntdll/env.c | 51 +++++++++++++++++++++++++------------------------- dlls/ntdll/tests/env.c | 1 - 2 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index fa00340058b..6db6cee17cd 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -497,11 +497,11 @@ PRTL_USER_PROCESS_PARAMETERS WINAPI RtlDeNormalizeProcessParams( RTL_USER_PROCES }
-#define ROUND_SIZE(size) (((size) + sizeof(void *) - 1) & ~(sizeof(void *) - 1)) +#define ROUND_SIZE(size,align) (((size) + (align) - 1) & ~((align) - 1))
/* append a unicode string to the process params data; helper for RtlCreateProcessParameters */ static void append_unicode_string( void **data, const UNICODE_STRING *src, - UNICODE_STRING *dst ) + UNICODE_STRING *dst, size_t align ) { dst->Length = src->Length; dst->MaximumLength = src->MaximumLength; @@ -509,12 +509,13 @@ static void append_unicode_string( void **data, const UNICODE_STRING *src, { dst->Buffer = *data; memcpy( dst->Buffer, src->Buffer, dst->Length ); - *data = (char *)dst->Buffer + ROUND_SIZE( dst->MaximumLength ); + *data = (char *)dst->Buffer + ROUND_SIZE( dst->MaximumLength, align ); } else dst->Buffer = NULL; }
-static RTL_USER_PROCESS_PARAMETERS *alloc_process_params( const UNICODE_STRING *image, +static RTL_USER_PROCESS_PARAMETERS *alloc_process_params( size_t align, + const UNICODE_STRING *image, const UNICODE_STRING *dllpath, const UNICODE_STRING *curdir, const UNICODE_STRING *cmdline, @@ -531,34 +532,34 @@ static RTL_USER_PROCESS_PARAMETERS *alloc_process_params( const UNICODE_STRING * if (env) env_size = get_env_length( env ) * sizeof(WCHAR);
size = (sizeof(RTL_USER_PROCESS_PARAMETERS) - + ROUND_SIZE( image->MaximumLength ) - + ROUND_SIZE( dllpath->MaximumLength ) - + ROUND_SIZE( curdir->MaximumLength ) - + ROUND_SIZE( cmdline->MaximumLength ) - + ROUND_SIZE( title->MaximumLength ) - + ROUND_SIZE( desktop->MaximumLength ) - + ROUND_SIZE( shell->MaximumLength ) - + ROUND_SIZE( runtime->MaximumLength )); - - if (!(ptr = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, size + ROUND_SIZE( env_size ) ))) + + ROUND_SIZE( image->MaximumLength, align ) + + ROUND_SIZE( dllpath->MaximumLength, align ) + + ROUND_SIZE( curdir->MaximumLength, align ) + + ROUND_SIZE( cmdline->MaximumLength, align ) + + ROUND_SIZE( title->MaximumLength, align ) + + ROUND_SIZE( desktop->MaximumLength, align ) + + ROUND_SIZE( shell->MaximumLength, align ) + + ROUND_SIZE( runtime->MaximumLength, align )); + + if (!(ptr = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, size + ROUND_SIZE( env_size, align )))) return NULL;
params = ptr; params->AllocationSize = size; params->Size = size; params->Flags = PROCESS_PARAMS_FLAG_NORMALIZED; - params->EnvironmentSize = ROUND_SIZE( env_size ); + params->EnvironmentSize = ROUND_SIZE( env_size, align ); /* all other fields are zero */
ptr = params + 1; - append_unicode_string( &ptr, curdir, ¶ms->CurrentDirectory.DosPath ); - append_unicode_string( &ptr, dllpath, ¶ms->DllPath ); - append_unicode_string( &ptr, image, ¶ms->ImagePathName ); - append_unicode_string( &ptr, cmdline, ¶ms->CommandLine ); - append_unicode_string( &ptr, title, ¶ms->WindowTitle ); - append_unicode_string( &ptr, desktop, ¶ms->Desktop ); - append_unicode_string( &ptr, shell, ¶ms->ShellInfo ); - append_unicode_string( &ptr, runtime, ¶ms->RuntimeInfo ); + append_unicode_string( &ptr, curdir, ¶ms->CurrentDirectory.DosPath, align ); + append_unicode_string( &ptr, dllpath, ¶ms->DllPath, align ); + append_unicode_string( &ptr, image, ¶ms->ImagePathName, align ); + append_unicode_string( &ptr, cmdline, ¶ms->CommandLine, align ); + append_unicode_string( &ptr, title, ¶ms->WindowTitle, align ); + append_unicode_string( &ptr, desktop, ¶ms->Desktop, align ); + append_unicode_string( &ptr, shell, ¶ms->ShellInfo, align ); + append_unicode_string( &ptr, runtime, ¶ms->RuntimeInfo, align ); if (env) params->Environment = memcpy( ptr, env, env_size ); return params; } @@ -603,7 +604,7 @@ NTSTATUS WINAPI RtlCreateProcessParametersEx( RTL_USER_PROCESS_PARAMETERS **resu if (!ShellInfo) ShellInfo = &empty_str; if (!RuntimeInfo) RuntimeInfo = &null_str;
- if ((*result = alloc_process_params( ImagePathName, DllPath, &curdir, CommandLine, + if ((*result = alloc_process_params( sizeof(void *), ImagePathName, DllPath, &curdir, CommandLine, Environment, WindowTitle, Desktop, ShellInfo, RuntimeInfo ))) { if (cur_params) (*result)->ConsoleFlags = cur_params->ConsoleFlags; @@ -664,7 +665,7 @@ void init_user_process_params(void) else env[0] = 0; }
- if (!(new_params = alloc_process_params( ¶ms->ImagePathName, ¶ms->DllPath, + if (!(new_params = alloc_process_params( 1, ¶ms->ImagePathName, ¶ms->DllPath, ¶ms->CurrentDirectory.DosPath, ¶ms->CommandLine, NULL, ¶ms->WindowTitle, ¶ms->Desktop, ¶ms->ShellInfo, ¶ms->RuntimeInfo ))) diff --git a/dlls/ntdll/tests/env.c b/dlls/ntdll/tests/env.c index a6bdd402393..33a6eb277bf 100644 --- a/dlls/ntdll/tests/env.c +++ b/dlls/ntdll/tests/env.c @@ -274,7 +274,6 @@ static UINT_PTR check_string_( int line, RTL_USER_PROCESS_PARAMETERS *params, UN ok_(__FILE__,line)( (UINT_PTR)str->Buffer == align(pos, sizeof(void *)), "wrong buffer %Ix/%Ix\n", (UINT_PTR)str->Buffer, pos ); else /* initial params are not aligned */ - todo_wine_if ((UINT_PTR)str->Buffer != pos) ok_(__FILE__,line)( (UINT_PTR)str->Buffer == pos, "wrong buffer %Ix/%Ix\n", (UINT_PTR)str->Buffer, pos ); if (str->Length < str->MaximumLength)
-
Alexandre Julliard