Browse Source

Merge pull request #262 from jogo-/patch-2

Note NSIS now also preloads ntmarta.dll
Martijn Laan 7 years ago
parent
commit
07231c3343
1 changed files with 2 additions and 0 deletions
  1. 2 0
      Projects/SafeDLLPath.pas

+ 2 - 0
Projects/SafeDLLPath.pas

@@ -148,6 +148,8 @@ initialization
       // WIX3: required by CLSIDFromProgID() when loading msxml?.dll
       // NSIS: XP.SP2&SP3: SHAutoComplete ... OLE32!InitializeCatalogIfNecessary ... OLE32!CComCatalog::TryToLoadCLB
       SafeLoadLibrary(SystemDir + 'clbcatq.dll');
+      // NSIS: Win7 without KB2533623: SHGetFileInfo ... SetEntriesInAcl ... ADVAPI32!AccProvpLoadMartaFunctions
+      SafeLoadLibrary(SystemDir + 'ntmarta.dll');
 {
       // WIX3: required by Burn
       SafeLoadLibrary(SystemDir + 'cabinet.dll');