Skip to content

Commit

Permalink
[WINESYNC] ntdll: Also load arm64 manifests for amd64 architecture on…
Browse files Browse the repository at this point in the history
… ARM64EC.

wine commit id 6e6450fd96f2ab3ab1535a2c0a9b0efd8e84802d by Alexandre Julliard <[email protected]>
  • Loading branch information
winesync authored and tkreuzer committed Nov 22, 2024
1 parent 7551707 commit 0c2c08e
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions sdk/lib/rtl/actctx.c
Original file line number Diff line number Diff line change
Expand Up @@ -639,12 +639,12 @@ static const xmlstr_t empty_xmlstr;

#ifdef __i386__
static const WCHAR current_archW[] = L"x86";
#elif defined __aarch64__ || defined __arm64ec__
static const WCHAR current_archW[] = L"arm64";
#elif defined __x86_64__
static const WCHAR current_archW[] = L"amd64";
#elif defined __arm__
static const WCHAR current_archW[] = L"arm";
#elif defined __aarch64__
static const WCHAR current_archW[] = L"arm64";
#else
static const WCHAR current_archW[] = L"none";
#endif
Expand Down Expand Up @@ -3314,6 +3314,10 @@ static WCHAR *lookup_manifest_file( HANDLE dir, struct assembly_identity *ai )
ai->version.major, ai->version.minor, lang );
RtlInitUnicodeString( &lookup_us, lookup );

#ifdef __arm64ec__
if (!wcsncmp( lookup, L"amd64_", 6 )) memcpy( lookup, L"a??", 3 * sizeof(WCHAR) );
#endif

if (!NtQueryDirectoryFile( dir, 0, NULL, NULL, &io, buffer, sizeof(buffer),
FileBothDirectoryInformation, FALSE, &lookup_us, TRUE ))
{
Expand Down

0 comments on commit 0c2c08e

Please sign in to comment.