From a366fe072f801651c11025df9fbd0ccabae85ee6 Mon Sep 17 00:00:00 2001
From: rainwater <rainwater@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Wed, 4 Sep 2002 17:08:17 +0000
Subject: [PATCH] makensisw now takes same paramters as makensis (path to 
 makensis.exe is no longer passed)

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@907 212acab6-be3b-0410-9dea-997c60f758d6
---
 Contrib/Makensisw/Readme.txt  | 1 +
 Contrib/Makensisw/makensisw.h | 1 +
 Contrib/Makensisw/utils.cpp   | 3 +++
 3 files changed, 5 insertions(+)

diff --git a/Contrib/Makensisw/Readme.txt b/Contrib/Makensisw/Readme.txt
index a508cdee..f56e963f 100644
--- a/Contrib/Makensisw/Readme.txt
+++ b/Contrib/Makensisw/Readme.txt
@@ -141,6 +141,7 @@ Version History
 1.9
  - Text always scrolls to bottom (Kickik)
  - Updated link to new docs
+ - Makensisw now takes the same parameters as makensis
 
 
 Copyright Information
diff --git a/Contrib/Makensisw/makensisw.h b/Contrib/Makensisw/makensisw.h
index b8954ab0..93e4e659 100644
--- a/Contrib/Makensisw/makensisw.h
+++ b/Contrib/Makensisw/makensisw.h
@@ -38,6 +38,7 @@
 #define REGSEC		HKEY_LOCAL_MACHINE
 #define REGKEY		"Software\\NSIS"
 #define REGLOC		"MakeNSISWPlacement"
+#define EXENAME		"makensis.exe"
 #define MAX_STRING	256
 #define TIMEOUT		150
 #define MINWIDTH	350
diff --git a/Contrib/Makensisw/utils.cpp b/Contrib/Makensisw/utils.cpp
index bc5d7468..c7e9111a 100644
--- a/Contrib/Makensisw/utils.cpp
+++ b/Contrib/Makensisw/utils.cpp
@@ -129,6 +129,7 @@ void EnableItems(HWND hwnd) {
 }
 
 void CompileNSISScript() {
+	char s[MAX_PATH];
 	ClearLog(g_hwnd);
 	SetTitle(g_hwnd,NULL);
 	SetBranding(g_hwnd);
@@ -141,6 +142,8 @@ void CompileNSISScript() {
 		EnableWindow(GetDlgItem(g_hwnd,IDC_TEST),0);
 		return;
 	}
+	wsprintf(s,"%s %s",EXENAME,g_script);
+	lstrcpy(g_script,s);
 	// Disable buttons during compile
 	DisableItems(g_hwnd);
 	DWORD id;