Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-20 17:45:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

[RTL] actctx.c: Reduce diff to wine

Browse source 
The changes are:
- Do not allocate an additional WCHAR for the terminating UNICODE_NULL, since we already have that accounted for by sizeof(manifest_dirW)
- Use strcpyW intead of memcpy / strlenW, which does the same thing
- Add a define for user_shared_data
This commit is contained in:
Timo Kreuzer 2024-04-23 13:12:33 +03:00
parent 6e277fc0c0
commit 06a35089eb
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
sdk/lib/rtl/actctx.c
View file

@ -33,6 +33,7 @@
#define FILE_END_OF_FILE_INFORMATION FILE_STANDARD_INFORMATION #define FILE_END_OF_FILE_INFORMATION FILE_STANDARD_INFORMATION
#define FileEndOfFileInformation FileStandardInformation #define FileEndOfFileInformation FileStandardInformation
#define RELATIVE_PATH RtlPathTypeRelative #define RELATIVE_PATH RtlPathTypeRelative
#define user_shared_data SharedUserData
#undef RT_MANIFEST #undef RT_MANIFEST
#undef CREATEPROCESS_MANIFEST_RESOURCE_ID #undef CREATEPROCESS_MANIFEST_RESOURCE_ID
@ -3295,12 +3296,12 @@ static NTSTATUS lookup_winsxs(struct actctx_loader* acl, struct assembly_identit
if (!ai->arch || !ai->name || !ai->public_key) return STATUS_NO_SUCH_FILE; if (!ai->arch || !ai->name || !ai->public_key) return STATUS_NO_SUCH_FILE;
if (!(path = RtlAllocateHeap( GetProcessHeap(), 0, if (!(path = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(manifest_dirW) +
((strlenW(SharedUserData->NtSystemRoot) + 1) *sizeof(WCHAR)) + sizeof(manifest_dirW) ))) strlenW(user_shared_data->NtSystemRoot) * sizeof(WCHAR) )))
return STATUS_NO_MEMORY; return STATUS_NO_MEMORY;
memcpy( path, SharedUserData->NtSystemRoot, strlenW(SharedUserData->NtSystemRoot) * sizeof(WCHAR) ); strcpyW( path, user_shared_data->NtSystemRoot );
memcpy( path + strlenW(SharedUserData->NtSystemRoot), manifest_dirW, sizeof(manifest_dirW) ); memcpy( path + strlenW(path), manifest_dirW, sizeof(manifest_dirW) );
if (!RtlDosPathNameToNtPathName_U( path, &path_us, NULL, NULL )) if (!RtlDosPathNameToNtPathName_U( path, &path_us, NULL, NULL ))
{ {