From aedd00e2621fc84093e150a1bd0af8123f4e83bf Mon Sep 17 00:00:00 2001
From: Mark Jansen <mark.jansen@reactos.org>
Date: Sat, 9 Apr 2022 02:13:38 +0200
Subject: [PATCH] [sxs] Add support for the undocumented loadFrom keyword

---
 DependenciesLib/SxsManifest.cs                |  25 ++++++++++++++++++
 .../manifest-regress/Test-ManifestRegress.ps1 |  16 +++++++++--
 .../test_folder/custom_name64.dll             | Bin 0 -> 2560 bytes
 .../manifest-regress/test_folder/depdll32.dll | Bin 0 -> 2560 bytes
 test/manifest-regress/use_dll32.exe           | Bin 0 -> 2048 bytes
 test/manifest-regress/use_dll32.exe.manifest  |   8 ++++++
 test/manifest-regress/use_dll64.exe           | Bin 0 -> 2048 bytes
 test/manifest-regress/use_dll64.exe.manifest  |   8 ++++++
 8 files changed, 55 insertions(+), 2 deletions(-)
 create mode 100644 test/manifest-regress/test_folder/custom_name64.dll
 create mode 100644 test/manifest-regress/test_folder/depdll32.dll
 create mode 100644 test/manifest-regress/use_dll32.exe
 create mode 100644 test/manifest-regress/use_dll32.exe.manifest
 create mode 100644 test/manifest-regress/use_dll64.exe
 create mode 100644 test/manifest-regress/use_dll64.exe.manifest

diff --git a/DependenciesLib/SxsManifest.cs b/DependenciesLib/SxsManifest.cs
index efb8c19..7aa86ed 100644
--- a/DependenciesLib/SxsManifest.cs
+++ b/DependenciesLib/SxsManifest.cs
@@ -42,6 +42,31 @@ public SxsEntry(XElement SxsAssemblyIdentity, XElement SxsFile, string Folder)
             Type = "";
             PublicKeyToken = "";
 
+            string loadFrom = SxsFile.Attribute("loadFrom")?.Value?.ToString();
+            if (!string.IsNullOrEmpty(loadFrom))
+            {
+                loadFrom = Environment.ExpandEnvironmentVariables(loadFrom);
+                if (!System.IO.Path.IsPathRooted(loadFrom))
+                {
+                    loadFrom = System.IO.Path.Combine(Folder, loadFrom);
+                }
+
+                // It's only a folder
+                if (loadFrom.EndsWith("\\") || loadFrom.EndsWith("/"))
+                {
+                    Path = System.IO.Path.Combine(loadFrom, RelPath);
+                }
+                else
+                {
+                    // It's also a dll name!
+                    Path = loadFrom;
+                    if (!Path.ToLower().EndsWith(".dll"))
+                    {
+                        Path += ".DLL";
+                    }
+                }
+            }
+
             if (SxsAssemblyIdentity != null)
             {
                 if (SxsAssemblyIdentity.Attribute("version") != null)
diff --git a/test/manifest-regress/Test-ManifestRegress.ps1 b/test/manifest-regress/Test-ManifestRegress.ps1
index 165cd4d..83f21d1 100644
--- a/test/manifest-regress/Test-ManifestRegress.ps1
+++ b/test/manifest-regress/Test-ManifestRegress.ps1
@@ -53,7 +53,7 @@ function Test-Executable {
     }
     else 
     {
-        Write-Host -ForegroundColor Green "[+] $TestName test passed";    
+        Write-Host -ForegroundColor Green "[+] $TestName test passed";
     }
 
     Write-Output ""
@@ -72,4 +72,16 @@ Test-Executable -TestName "SystemSettings" -TestExecutable $SystemSettingsPath -
 
 # Double quotes in assemblyIdentity name attribute !
 $DevicePairingFolderPath = Join-Path $RegressDir "DevicePairingFolder.dll";
-Test-Executable -TestName "DevicePairingFolder" -TestExecutable $DevicePairingFolderPath -Command "-manifest" -StringToFound '<assemblyIdentity name="Microsoft.Windows.Shell.DevicePairingFolder" processorArchitecture="amd64"' -BinFolder $DependenciesDir
\ No newline at end of file
+Test-Executable -TestName "DevicePairingFolder" -TestExecutable $DevicePairingFolderPath -Command "-manifest" -StringToFound '<assemblyIdentity name="Microsoft.Windows.Shell.DevicePairingFolder" processorArchitecture="amd64"' -BinFolder $DependenciesDir
+
+# Redirect dll loading to a directory, so search for this directory name in the sxs dependencies
+$UseDll32Path = Join-Path $RegressDir "use_dll32.exe";
+Test-Executable -TestName "DllRedirection32" -TestExecutable $UseDll32Path -Command "-sxsentries" -StringToFound '\test_folder\depdll32.dll' -BinFolder $DependenciesDir
+
+# Redirect the dll to a directory, but also change the dll name!
+$UseDll64Path = Join-Path $RegressDir "use_dll64.exe";
+Test-Executable -TestName "DllRedirection64CustomName" -TestExecutable $UseDll64Path -Command "-sxsentries" -StringToFound '\test_folder\custom_name64.DLL' -BinFolder $DependenciesDir
+
+# Re-run the previous test, but ensure dependencies also knows the original dll name!
+$UseDll64Path = Join-Path $RegressDir "use_dll64.exe";
+Test-Executable -TestName "DllRedirection64RealName" -TestExecutable $UseDll64Path -Command "-sxsentries" -StringToFound 'depdll64.dll' -BinFolder $DependenciesDir
diff --git a/test/manifest-regress/test_folder/custom_name64.dll b/test/manifest-regress/test_folder/custom_name64.dll
new file mode 100644
index 0000000000000000000000000000000000000000..bfe81fffe5f14eadf5be1ea081371c9458015e5f
GIT binary patch
literal 2560
zcmeHH&x_Mg5T0~fQP*yJS;#@~wJ3OsqT*>`D;SNi)dj5w5!Y<<aEoag(yV&)$F2}c
z!9T#WCvOTCPZckU?%DMZ5Vqi9Z|-3se(xn|N`*!AR(4?KoB3ukZ{~%hdg}#E5m6Qz
zhD1G}kczZ>o5x7c9D6@QZx3yhddk8^>BdT<&0Mc_&oi5>ZaPlOXUm*<s}5^8?BccS
ztl6@-md_tP9=Bf9iLB>hf>gFiD^F(*qy)Tv5k}~!%|vqxQp_)<0t<fAk$@n2D1krY
zh}kX?8K`E!Ip9!E6D6|_xqonOqwmQ*p3{8($VXmPV8qDSK`I~-Ms!!ROy2}i5qS`D
z@!|4_Ar)Mg=0=5bcI+T~9TeGADk!ZP!4KofPf=k6)uPd<7Pqz#1p01A-@Ov_jqdDb
z0ZEbghQxZmu$BW3W?@ibbn`utS3VfQr@;}BMmP5g%m6NZ{s^OFGr8=PvKXJmK*_U$
znz|6^tfQ;Xc9g=p3ci=c{?Vz+$*B#&i)%?cB8X*t{<x>n(HYuwYN{OkX&8plMoEuk
zrtri~aod#Q9T_M6CmrV}eZl|SZ>^Lzcnx2C$1g{?ukihmIISjn7xVqG{P(f=Z|j=v
z2X)WaEZfE@ZQrvwesZ(~&uP?~F5Tyz!|k(Y;)=`MuePjJn_p_!{HodH7e<GJUoPX@
z1SYB?J_=<}@eevBkSy-v#PjE5S9nXV>92^yzD&RkOyfP9Pz(AH`X=_j0DnPup!+hp
GH}D%+)27}4

literal 0
HcmV?d00001

diff --git a/test/manifest-regress/test_folder/depdll32.dll b/test/manifest-regress/test_folder/depdll32.dll
new file mode 100644
index 0000000000000000000000000000000000000000..faa8e04bf55110bc7ccff78e7e9a390958a43c37
GIT binary patch
literal 2560
zcmeHIzl#$=6n?8w&NG)>p<tyG_1b08RxyfEi$nuzBjVkf9ZYb4v6&MK3+3*LBZXI5
zSXfxv2o^yQ4z<wYKm;2r5rhl)2V4<Yzc;(N%}Fl*z~#Zr``-7>zIpSQ-L2hOqy0pb
z!-!*|E<9UV&*P`3kP9c?7wFxgjZ)XBZj^2{TWt|W!Gp;5M8o#|K#BWOM2o&?`Qq}8
zo5BkmY0k_{pH5TPD@0X;E6D5@6;2&C4rT<<t65Au1O_9<`;xku;QF<dF@q0&Xomm`
zdF{4O!fz#_YhVTZIhJ=bi|E*H+8F*W@*WwZn@T=b&^LKadKRvG*aXpn>DbB!DOdxc
z54wF=#IQ2ax*16~Xr#5GW}Rz_)y&F7m$E29w^#o>`^)*(I+dyV<_Dmq&$-n~zf<Yg
zyV!BIu7x*R$givymk$8;ikP(Asr8L7z3D;N1E8;;bXtZ;n_t>8iYrGEbaMvLaMpWF
zf}`ZIk9okIHe4T<l26Kc8OL!_<bO}bbLc$!8P6@GzN!7rtdnTafeQmL@gqABmNI%7
znBVIsL)>d%+^~`M9Q=z^dz<=EoY#KTh?MELF4DAB<Vqi49>{MsypSHs$d~TfGwF(}
zQq=-y(Un(PuDou0^5V$d@d-FdWI!8?E!5D*An^Q-6xov_L+qSp2bvFU)ns8}d!Ylk
a2mF6KZk@NPma@KEKds;V|CrdG=)gZxgqG?6

literal 0
HcmV?d00001

diff --git a/test/manifest-regress/use_dll32.exe b/test/manifest-regress/use_dll32.exe
new file mode 100644
index 0000000000000000000000000000000000000000..64efcea1d7d785cac4f448a3928c915538888b8f
GIT binary patch
literal 2048
zcmeHHO=uHA6n<%=#M;&hMGqdFLV6Ii{#`_=q|nuiKPy@gQPMR#Z9_MkWwVtOR9b4V
z%NoqVgU5;p9u+)9PnGl{=tYVY^pJzX2HTsU2XXyovW=;S9*XqjgZIAozIlH$EPM7!
ziCT#$3Jn6HGEhiD+V#y8jyw0h>ZBLj-u09tXWsQ(8cXMxWoJiiEyGfpX=WXEoilsF
zWNDKPp1;U4S)KQFbhO38)~Z5uCepHIP?dJHZjWqT%XJ|X$^@OL`zRB83t2@vgaCa1
zE|T|>iK0#vOKgB3i7_HodjHl~=zDCPmVFM-J2;;eR~LJU3kbhS7}0Q_t~naGxd;ph
znX~q3C_yxjlMTs``(=8$9nDMSD6Cp6{QMOJs{9O8zY`lt*Dd@2?MYjh-*IOPhSj#i
z)bnd%qx$JfVhOsS`XAA4W+CPlzR5yi8-=WqEvSx0^b#J;#%g;cBT5o~4K7RuK@jff
zPstHcwcLu4sy|tuDEF<2PH!qi@_zdfl!}V4`oG}KEJW*fQWk-&BrY34{Xkd`Ky;$s
zyr?XOk5N=UsYRs<{jB=E^0eCn=YjJC_Z<7qEVR4IlBX=Gep|hPSYjQyyFWfuG~&?<
zZf&|IK7>N#fPj8sZY}S7U5L0<_pKKThNGUcT=Bo-0X*`k;;+C{{jbtK!HDUF7;MGk
zzW+gz4-vu%UhPcKduZ)Gh#}92$BKh->`8~`T_vhN0!ywED=#C*Rocr{iCyBfyQswU
z$0Ffc{T@NDg~vwU-h7C2A>IseD#SY>&W3m|#8QY4LVPGujQB5`{{mMJ(x725Bdh6L
zKhAn{ZEJUU%KpSv_~O6ztch#sA<83OYT|B#n`?@xNmfF>139~)40-^15_%3g1WiH5
zp+dY6H(EE&ZIc^EkM!w=fp(|4b2h6_82nV);ODdqAD~R`M#^@=^PFQ_*X?m+T6WrW
zM&Kk<S<|tz#)u_?WR5#Y&9aitq{SsM%AJgsHZ^-RhnVNn;<ui>oU$CuaJVg^RhH*d
d+;Wm*nyDMyK1w>buvcR{_(@B1#!#|Z@*6wpYeE13

literal 0
HcmV?d00001

diff --git a/test/manifest-regress/use_dll32.exe.manifest b/test/manifest-regress/use_dll32.exe.manifest
new file mode 100644
index 0000000..f459350
--- /dev/null
+++ b/test/manifest-regress/use_dll32.exe.manifest
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<assemblyIdentity type="win32" name="use_dll" version="0.0.0.0"/>
+
+<file name="depdll32.dll" loadFrom="test_folder\" />
+
+</assembly>
+
diff --git a/test/manifest-regress/use_dll64.exe b/test/manifest-regress/use_dll64.exe
new file mode 100644
index 0000000000000000000000000000000000000000..c4d436b6f9ff1334f0edcecff5b4355ecb335f24
GIT binary patch
literal 2048
zcmeHHOKTHR6uwDQwePwR+<7bQN}7s_3s+GZor2MV7Da?~+PQ5*Co{ujsufD9Xv86m
zSg?P<-{2zcD&ocm-MH#9iwYBPksnYTzjJ5us7e;1D?M<}<2&Cu_uM;|$=rL%x)@^#
ztRP^l3`>%dy0h9qdhpcFAbZoZJ5r8a-yONVlq+z{HWzI*&*xRcFdaT8xV>WVoWUn=
z-r{*v6Ul*r-qEP_beb{k8BNfVI-7|1#gDWAc>FljFhMC&p&t+DrjX{Bl7a@lbe73;
zMMX{1bY!ovq|IfVGd3N<p+=vR?eTB=7H8~khuWkgRvqN4F(?`cXOIh~A)K+<q^3G5
zfC}*dNKW(ch#@JYlU7KSv*Qesclb()mzq)BFUsSu(`Z*tKux(7#oIdg76i&Rs-*Z2
zkx&{hgDGyYPWh5F#mdmrZqRD|P>NTi(%Mn-!#vnkVtXexhY0j2^2e#8TlB*|WSV_W
zw`vI+Y=v^5=f`RzAtZ~RRAN8PQ&a=m(4$fOPegW$dvd2OX}p0RjN(%}d8is3_Te3i
zCF0$QuGpc^-?*O!*G*S<=w+ce#{6}_+c*mI*Ps+HT~*x4Q7*eqxo-jZ@<M0oikCU?
zvqUO|SZStS0<?y?-1L4av+qwKiz(2!ZH{2<Bi#TC#y&?jj@c=0;GHdTJIVbCHmU1e
zH&sn&m-twr_b~fCZ^axJPw#lI4Z8wt1Mx6yL$=_Tf&EIx+jx}EMDd--&PFyL+4ac2
zh-{<h>mTC3)puFghS1NSOKQ4~y{`!;V`?k9xSG?&4K*(=vwY#fyzNB!f@52A_A;23
zoim&TIN5pAaBNdwuqenDgp*Y*E9*S6gaj6alUH+wYA+TLi`AUNG+|-8ix;A%@Uxcc
dEFt~Jr4Rp_KKxtzvCd#^V!gupFaO33d<T?SB@+Mu

literal 0
HcmV?d00001

diff --git a/test/manifest-regress/use_dll64.exe.manifest b/test/manifest-regress/use_dll64.exe.manifest
new file mode 100644
index 0000000..0dab560
--- /dev/null
+++ b/test/manifest-regress/use_dll64.exe.manifest
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<assemblyIdentity type="win32" name="use_dll" version="0.0.0.0"/>
+
+<file name="depdll64.dll" loadFrom="test_folder/custom_name64" />
+
+</assembly>
+