From e2d28022e273596bfacd7895aeac044e7a89d05c Mon Sep 17 00:00:00 2001
From: anders_k <anders_k@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Thu, 24 Dec 2015 00:40:28 +0000
Subject: [PATCH] Preload some system libraries (bug #1125)

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6688 212acab6-be3b-0410-9dea-997c60f758d6
---
 Source/exehead/Main.c | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/Source/exehead/Main.c b/Source/exehead/Main.c
index 2c38f6c2..eb231e77 100644
--- a/Source/exehead/Main.c
+++ b/Source/exehead/Main.c
@@ -93,23 +93,13 @@ EXTERN_C void NSISWinMainNOCRT()
   TCHAR seekchar=_T(' ');
   TCHAR *cmdline;
 
-  InitCommonControls();
-
   SetErrorMode(SEM_NOOPENFILEERRORBOX | SEM_FAILCRITICALERRORS);
 
-#if defined(NSIS_SUPPORT_ACTIVEXREG) || defined(NSIS_SUPPORT_CREATESHORTCUT)
-  {
-    extern HRESULT g_hres;
-    g_hres=OleInitialize(NULL);
-  }
-#endif
-
   {
     // bug #1125: Don't load modules from the application nor current directory.
     // SetDefaultDllDirectories() allows us to restrict implicitly loaded and 
-    // dynamically loaded modules (with relative paths) to just 
-    // %windir%\System32 and directories added with AddDllDirectory().
-    // This prevents DLL search order attacks (CAPEC-471).
+    // dynamically loaded modules to just %windir%\System32 and directories 
+    // added with AddDllDirectory(). This prevents DLL search order attacks (CAPEC-471).
     DWORD winver = GetVersion();
     // CoCreateInstance(CLSID_ShellLink, ...) fails on Vista if SetDefaultDllDirectories is called
     BOOL avoidwinbug = LOWORD(winver) == MAKEWORD(6, 0);
@@ -118,6 +108,9 @@ EXTERN_C void NSISWinMainNOCRT()
       FARPROC fp = myGetProcAddress(MGA_SetDefaultDllDirectories);
       if (fp) ((BOOL(WINAPI*)(DWORD))fp)(LOAD_LIBRARY_SEARCH_SYSTEM32|LOAD_LIBRARY_SEARCH_USER_DIRS);
     }
+    LoadSystemLibrary("UXTHEME"); // On Vista OleInitialize calls NtUserCreateWindowEx and that pulls in UXTheme.dll
+    LoadSystemLibrary("USERENV"); // On Vista SHGetFileInfo ends up in SHELL32.kfapi::GetUserProfileDir and that pulls in UserEnv.dll
+    LoadSystemLibrary("SETUPAPI"); // On XP SHGetFileInfo ends up in CMountPoint::_InitLocalDriveHelper and that pulls in SetupAPI.dll
   }
 
   // Because myGetProcAddress now loads dlls with a full path 
@@ -136,6 +129,17 @@ EXTERN_C void NSISWinMainNOCRT()
 #endif
   g_SHGetFolderPath = myGetProcAddress(MGA_SHGetFolderPath); // and SHFOLDER
 
+
+  InitCommonControls();
+
+#if defined(NSIS_SUPPORT_ACTIVEXREG) || defined(NSIS_SUPPORT_CREATESHORTCUT)
+  {
+    extern HRESULT g_hres;
+    g_hres=OleInitialize(NULL);
+  }
+#endif
+
+
   {
     // workaround for bug #1008632
     // http://sourceforge.net/tracker/index.php?func=detail&aid=1008632&group_id=22049&atid=373085