From a7a2385eaf49265a7cd948c7e460818eb6119c4f Mon Sep 17 00:00:00 2001
From: DavidXanatos <3890945+DavidXanatos@users.noreply.github.com>
Date: Wed, 4 Dec 2024 20:43:23 +0100
Subject: [PATCH] #4415

---
 Installer/Sandboxie-Plus.iss | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/Installer/Sandboxie-Plus.iss b/Installer/Sandboxie-Plus.iss
index 5b8f37a1..6cd9b5bb 100644
--- a/Installer/Sandboxie-Plus.iss
+++ b/Installer/Sandboxie-Plus.iss
@@ -53,10 +53,24 @@ Name: "RefreshBuild"; Description: "{cm:RefreshBuild}"; MinVersion: 0.0,5.0; Che
 [Files]
 ; Both portable and install.
 Source: ".\Release\{#MyAppSrc}\*"; DestDir: "{app}"; MinVersion: 0.0,5.0; Flags: recursesubdirs ignoreversion; Excludes: "*.pdb"
-; Include the .pdb files.
+
+; Include the .pdb files for all builds.
 Source: ".\Release\{#MyAppSrc}\SbieDrv.pdb"; DestDir: "{app}"; MinVersion: 0.0,5.0; Flags: ignoreversion
 Source: ".\Release\{#MyAppSrc}\SbieDll.pdb"; DestDir: "{app}"; MinVersion: 0.0,5.0; Flags: ignoreversion
 
+; Include 32-bit .pdb file only in x64 and ARM64 builds.
+#if MyAppArch == "x64"
+Source: ".\Release\{#MyAppSrc}\32\SbieDll.pdb"; DestDir: "{app}\32\"; MinVersion: 0.0,5.0; Flags: ignoreversion
+#endif
+#if MyAppArch == "arm64"
+Source: ".\Release\{#MyAppSrc}\32\SbieDll.pdb"; DestDir: "{app}\32\"; MinVersion: 0.0,5.0; Flags: ignoreversion
+#endif
+
+; Include 64-bit .pdb file only in ARM64 builds.
+#if MyAppArch == "arm64"
+Source: ".\Release\{#MyAppSrc}\64\SbieDll.pdb"; DestDir: "{app}\64\"; MinVersion: 0.0,5.0; Flags: ignoreversion
+#endif
+
 ; Only if portable.
 Source: ".\Sandboxie.ini"; DestDir: "{app}"; Flags: ignoreversion onlyifdoesntexist; Check: IsPortable
 Source: ".\Sandboxie-Plus.ini"; DestDir: "{app}"; Flags: ignoreversion onlyifdoesntexist; Check: IsPortable
@@ -165,6 +179,16 @@ begin
   end;
 end;
 
+function Is64BitInstallMode: Boolean;
+begin
+  Result := (ProcessorArchitecture = paX64) or (ProcessorArchitecture = paARM64);
+end;
+
+function IsARM64InstallMode: Boolean;
+begin
+  Result := ProcessorArchitecture = paARM64;
+end;
+
 function IsOpenSandMan(): Boolean;
 begin