Browse Source

Ensure that TextShaping.dll is loaded from the correct place

This is another DLL that apparently needs to be listed in the manifest,
at least when running installers on this developer's Windows 11 machine.

Signed-off-by: Johannes Schindelin <[email protected]>
Johannes Schindelin 2 years ago
parent
commit
efd17e9200
3 changed files with 2 additions and 1 deletions
  1. 1 1
      Projects/CompExeUpdate.pas
  2. 1 0
      Projects/XPTheme.manifest
  3. BIN
      Projects/XPTheme.res

+ 1 - 1
Projects/CompExeUpdate.pas

@@ -502,7 +502,7 @@ end;
 procedure RemoveManifestDllHijackProtection(const F: TCustomFile; const TestBlockOnly: Boolean);
 procedure RemoveManifestDllHijackProtection(const F: TCustomFile; const TestBlockOnly: Boolean);
 const
 const
   BlockStartText: AnsiString = '<file name="';
   BlockStartText: AnsiString = '<file name="';
-  BlockLength = 313;
+  BlockLength = 380;
 var
 var
   S: AnsiString;
   S: AnsiString;
   Offset: Integer64;
   Offset: Integer64;

+ 1 - 0
Projects/XPTheme.manifest

@@ -42,6 +42,7 @@
 <file name="mpr.dll" loadFrom="%SystemRoot%\system32\" />
 <file name="mpr.dll" loadFrom="%SystemRoot%\system32\" />
 <file name="netapi32.dll" loadFrom="%SystemRoot%\system32\" />
 <file name="netapi32.dll" loadFrom="%SystemRoot%\system32\" />
 <file name="netutils.dll" loadFrom="%SystemRoot%\system32\" />
 <file name="netutils.dll" loadFrom="%SystemRoot%\system32\" />
+<file name="textshaping.dll" loadFrom="%SystemRoot%\system32\" />
 <file name="version.dll" loadFrom="%SystemRoot%\system32\" />
 <file name="version.dll" loadFrom="%SystemRoot%\system32\" />
 <file name="winhttp.dll" loadFrom="%SystemRoot%\system32\" />
 <file name="winhttp.dll" loadFrom="%SystemRoot%\system32\" />
 </assembly>
 </assembly>

BIN
Projects/XPTheme.res