From 13301228a00d1021a51c12e48c9390ba93bbd522 Mon Sep 17 00:00:00 2001
From: anders_k <anders_k@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Tue, 13 Mar 2018 19:35:35 +0000
Subject: [PATCH] Preload NTMARTA.DLL for Windows 7

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6984 212acab6-be3b-0410-9dea-997c60f758d6
---
 Docs/src/history.but  | 2 ++
 Source/exehead/Main.c | 1 +
 2 files changed, 3 insertions(+)

diff --git a/Docs/src/history.but b/Docs/src/history.but
index bad34a28..b5a4ed66 100644
--- a/Docs/src/history.but
+++ b/Docs/src/history.but
@@ -8,6 +8,8 @@ Released on ??? ??th, 20??
 
 \S2{} Minor Changes
 
+\b Added NTMARTA to preload list to fix rare Windows 7 security issue (\W{http://sf.net/p/nsis/bugs/1204}{bug #1204})
+
 \b MakeNSIS prints -CMDHELP to stdout (\W{http://sf.net/p/nsis/bugs/1203}{bug #1203})
 
 \S2{} Translations
diff --git a/Source/exehead/Main.c b/Source/exehead/Main.c
index 83aa51e1..0976a4db 100644
--- a/Source/exehead/Main.c
+++ b/Source/exehead/Main.c
@@ -126,6 +126,7 @@ EXTERN_C void NSISWinMainNOCRT()
         "CRYPTBASE\0" // Win7 without KB2533623: OleInitialize ... RPCRT4.UuidCreate ... RPCRT4.GenerateRandomNumber
         "OLEACC\0" // Vista: SHFileOperation ... SHELL32.CProgressDialogUI::_Setup ... SHELL32.GetRoleTextW
         "CLBCATQ\0" // XP.SP2&SP3: SHAutoComplete ... OLE32!InitializeCatalogIfNecessary ... OLE32!CComCatalog::TryToLoadCLB
+        "NTMARTA\0" // Win7 without KB2533623 (Bug #1204): SHGetFileInfo ... SetEntriesInAcl ... ADVAPI32!AccProvpLoadMartaFunctions
 #ifndef NSIS_SUPPORT_GETDLLVERSION
         "VERSION\0"
 #endif