From aebc819abff6a01c173aa9d6a736ba0d8ccdb3b8 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Thu, 2 Mar 2023 18:12:28 +0100
Subject: [PATCH] wine.inf: Set Program Files variables separately for all WoW
 platforms.

---
 loader/wine.inf.in | 38 +++++++++++++++++++++++++++++++++-----
 1 file changed, 33 insertions(+), 5 deletions(-)

diff --git a/loader/wine.inf.in b/loader/wine.inf.in
index 6199c73f300..34b90ef6bbf 100644
--- a/loader/wine.inf.in
+++ b/loader/wine.inf.in
@@ -107,7 +107,7 @@ AddReg=\
     ContentIndex,\
     ControlClass,\
     CurrentVersion,\
-    CurrentVersionWow64,\
+    CurrentVersionWow64.ntamd64,\
     Debugger,\
     DirectX,\
     Fonts,\
@@ -132,7 +132,7 @@ AddReg=\
     ContentIndex,\
     ControlClass,\
     CurrentVersion,\
-    CurrentVersionWow64,\
+    CurrentVersionWow64.ntarm64,\
     Debugger,\
     DirectX,\
     Fonts,\
@@ -147,13 +147,13 @@ AddReg=\
     VersionInfo,\
     LicenseInformation
 
-[Wow64Install]
+[Wow64Install.ntx86]
 RegisterDlls=RegisterDllsSection
 WineFakeDlls=FakeDllsWin32,FakeDllsWow64
 CopyFiles=NlsFiles
 AddReg=\
     CurrentVersion,\
-    CurrentVersionWow64,\
+    CurrentVersionWow64.ntx86,\
     Debugger,\
     DirectX,\
     MCI,\
@@ -162,6 +162,20 @@ AddReg=\
     VersionInfo,\
     LicenseInformation
 
+[Wow64Install.ntarm]
+RegisterDlls=RegisterDllsSection
+WineFakeDlls=FakeDllsWin32,FakeDllsWow64
+CopyFiles=NlsFiles
+AddReg=\
+    CurrentVersion,\
+    CurrentVersionWow64.ntarm,\
+    Debugger,\
+    DirectX,\
+    MCI,\
+    Misc,\
+    Tapi,\
+    VersionInfo,\
+    LicenseInformation
 
 [DefaultInstall.Services]
 AddService=BITS,0,BITSService
@@ -401,10 +415,24 @@ HKLM,%CurrentVersionNT%\Print,,16
 HKLM,%CurrentVersionNT%\ProfileList,,16
 HKLM,%CurrentVersionNT%\Winlogon,"Shell",,"explorer.exe"
 
-[CurrentVersionWow64]
+[CurrentVersionWow64.ntamd64]
 HKLM,%CurrentVersion%,"ProgramFilesDir (x86)",,"%16426%"
 HKLM,%CurrentVersion%,"CommonFilesDir (x86)",,"%16428%"
 
+[CurrentVersionWow64.ntarm64]
+HKLM,%CurrentVersion%,"ProgramFilesDir (x86)",,"%16426%"
+HKLM,%CurrentVersion%,"CommonFilesDir (x86)",,"%16428%"
+HKLM,%CurrentVersion%,"ProgramFilesDir (Arm)",,"C:\Program Files (Arm)"
+HKLM,%CurrentVersion%,"CommonFilesDir (Arm)",,"C:\Program Files (Arm)\Common Files"
+
+[CurrentVersionWow64.ntx86]
+HKLM,%CurrentVersion%,"ProgramFilesDir (x86)",,"%16422%"
+HKLM,%CurrentVersion%,"CommonFilesDir (x86)",,"%16427%"
+
+[CurrentVersionWow64.ntarm]
+HKLM,%CurrentVersion%,"ProgramFilesDir (Arm)",,"%16422%"
+HKLM,%CurrentVersion%,"CommonFilesDir (Arm)",,"%16427%"
+
 [Debugger]
 HKLM,%CurrentVersionNT%\AeDebug,"Debugger",2,"winedbg --auto %ld %ld"
 HKLM,%CurrentVersionNT%\AeDebug,"Auto",2,"1"