From b929405bf832527ec165ee082ff68cb1c389e0e7 Mon Sep 17 00:00:00 2001
From: anders_k <anders_k@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Mon, 18 Sep 2017 14:04:53 +0000
Subject: [PATCH] Optimize away call to GetModuleHandle(NULL) under MS
 toolchain

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6904 212acab6-be3b-0410-9dea-997c60f758d6
---
 Contrib/MakeLangId/MakeLangId.cpp | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/Contrib/MakeLangId/MakeLangId.cpp b/Contrib/MakeLangId/MakeLangId.cpp
index 1b119a6c..69453211 100644
--- a/Contrib/MakeLangId/MakeLangId.cpp
+++ b/Contrib/MakeLangId/MakeLangId.cpp
@@ -38,9 +38,18 @@ https://wayback.archive.org/web/20021221200122/http://msdn.microsoft.com/library
 #define LOCALE_SNATIVEDISPLAYNAME 0x0073
 #endif
 #ifndef CB_SETCUEBANNER
-#define CB_SETCUEBANNER  (0x1700+3)
+#define CB_SETCUEBANNER (0x1700+3)
 #endif
 
+#if defined(_MSC_VER) && _MSC_VER >= 1200
+EXTERN_C IMAGE_DOS_HEADER __ImageBase;
+#define HINST_THISCOMPONENT ( (HINSTANCE) &__ImageBase )
+#define HINST_APPLICATION HINST_THISCOMPONENT
+#else
+#define HINST_APPLICATION ( (HINSTANCE) GetModuleHandle(NULL) )
+#endif
+
+
 static INT_PTR StrToIntptr(LPCTSTR s, bool ForceHex = false)
 {
 	UINT_PTR val = 0;
@@ -273,7 +282,7 @@ static void InitIntLangList(HWND hCtl)
 		#else
 		LPCTSTR name = g_IntLang[i].name;
 		#endif
-		AddLocale(hCtl, name,  g_IntLang[i].id);
+		AddLocale(hCtl, name, g_IntLang[i].id);
 	}
 }
 
@@ -372,7 +381,7 @@ NSIS_ENTRYPOINT_GUINOCRT
 EXTERN_C void NSISWinMainNOCRT()
 {
 	InitCommonControls();
-	HINSTANCE hInst = GetModuleHandle(0);
+	HINSTANCE hInst = HINST_APPLICATION;
 	HANDLE hIco = LoadImage(hInst, MAKEINTRESOURCE(IDI_ICON), IMAGE_ICON, 0, 0, LR_DEFAULTSIZE|LR_SHARED);
 	INT_PTR retval = DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_DIALOG), 0, DialogProc, (LPARAM) hIco);
 	ExitProcess((UINT) retval);