3 files changed, 22 insertions, 18 deletions

diff --git a/src/burn/stub/stub.cpp b/src/burn/stub/stub.cpp
index 9c9dfeef..d8cee9f1 100644
--- a/src/burn/stub/stub.cpp
+++ b/src/burn/stub/stub.cpp
@@ -41,20 +41,7 @@ int WINAPI wWinMain(
         hEngineFile = ::CreateFileW(sczPath, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
     }
 
-    // If the engine is in the clean room, we'll do the unsafe initialization
-    // because some systems in Windows (namely GDI+) will fail when run in
-    // a process that protects against DLL hijacking. Since we know the clean
-    // room is in a clean folder and not subject to DLL hijacking we won't
-    // make ourselves perfectly secure so that we can load BAs that still
-    // depend on those parts of Windows that are insecure to DLL hijacking.
-    if (EngineInCleanRoom(lpCmdLine))
-    {
-        AppInitializeUnsafe();
-    }
-    else
-    {
-        AppInitialize(rgsczSafelyLoadSystemDlls, countof(rgsczSafelyLoadSystemDlls));
-    }
+    AppInitialize(rgsczSafelyLoadSystemDlls, countof(rgsczSafelyLoadSystemDlls));
 
     AvoidLocalDllRedirection(sczPath);
 
diff --git a/src/burn/stub/stub.manifest b/src/burn/stub/stub.manifest
new file mode 100644
index 00000000..9718e9b1
--- /dev/null
+++ b/src/burn/stub/stub.manifest
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+ <assemblyIdentity name="WixToolset.Burn" version="5.0.0.0" type="win32"/>
+ <description>WiX Toolset Bootstrapper Engine</description>
+ <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"><application>
+  <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+  <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+  <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+  <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+  <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+ </application></compatibility>
+ <application xmlns="urn:schemas-microsoft-com:asm.v3"><windowsSettings>
+  <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true/pm</dpiAware>
+  <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2, PerMonitor, System</dpiAwareness>
+  <longPathAware xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">true</longPathAware>
+ </windowsSettings></application>
+ <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"><security><requestedPrivileges><requestedExecutionLevel level="asInvoker" uiAccess="false"/></requestedPrivileges></security></trustInfo>
+</assembly>
diff --git a/src/burn/stub/stub.vcxproj b/src/burn/stub/stub.vcxproj
index 03f49209..d07b8da7 100644
--- a/src/burn/stub/stub.vcxproj
+++ b/src/burn/stub/stub.vcxproj
@@ -35,7 +35,6 @@
     <ProjectSubSystem>Windows</ProjectSubSystem>
     <TargetName>burn</TargetName>
     <CharacterSet>Unicode</CharacterSet>
-    <GenerateManifest>false</GenerateManifest>
     <Description>Native component of WixToolset.Burn</Description>
     <!-- NBGV properties -->
     <AssemblyLanguage>1033</AssemblyLanguage>
@@ -62,7 +61,7 @@
     <Link>
       <SwapRunFromCD>true</SwapRunFromCD>
       <SwapRunFromNET>true</SwapRunFromNET>
-      <DelayLoadDLLs>cabinet.dll;crypt32.dll;msi.dll;shlwapi.dll;userenv.dll;version.dll;wininet.dll;wintrust.dll</DelayLoadDLLs>
+      <DelayLoadDLLs>cabinet.dll;crypt32.dll;msi.dll;rpcrt4.dll;shlwapi.dll;userenv.dll;version.dll;wininet.dll;wintrust.dll</DelayLoadDLLs>
       <AdditionalOptions>/DEPENDENTLOADFLAG:0x800 %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
@@ -81,6 +80,7 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
+    <Manifest Include="stub.manifest" />
     <ResourceCompile Include="stub.rc" />
   </ItemGroup>
 
@@ -91,9 +91,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
-
     <PackageReference Include="WixToolset.DUtil" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
   </ItemGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />