Display error message if starting the generated installer fails

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@7362 212acab6-be3b-0410-9dea-997c60f758d6

Author: sredna

Contrib/Makensisw/makensisw.cpp

@@ -650,7 +650,7 @@ INT_PTR CALLBACK DialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam
             lstrcpy(str,g_sdata.input_script);
             str2=_tcsrchr(str,_T('\\'));
             if(str2!=NULL) *(str2+1)=0;
-            ShellExecute(g_sdata.hwnd,_T("open"),str,NULL,NULL,SW_SHOWNORMAL);
+            ShellExecuteWithErrorBox(hwndDlg, str);
           }
           return TRUE;
         }
@@ -750,20 +750,18 @@ INT_PTR CALLBACK DialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam
         case IDC_TEST:
         {
           if (g_sdata.output_exe) {
-            ShellExecute(g_sdata.hwnd,_T("open"),g_sdata.output_exe,NULL,NULL,SW_SHOWNORMAL);
+            ShellExecuteWithErrorBox(hwndDlg, g_sdata.output_exe);
           }
           return TRUE;
         }
         case IDM_EDITSCRIPT:
         {
           if (g_sdata.input_script) {
-            LPCTSTR verb = _T("open"); // BUGBUG: Should not force the open verb?
-            HINSTANCE hi = ShellExecute(g_sdata.hwnd,verb,g_sdata.input_script,NULL,NULL,SW_SHOWNORMAL);
-            if ((UINT_PTR)hi <= 32) {
-              TCHAR path[MAX_PATH];
-              if (GetWindowsDirectory(path,sizeof(path))) {
-                lstrcat(path,_T("\\notepad.exe"));
-                ShellExecute(g_sdata.hwnd,verb,path,g_sdata.input_script,NULL,SW_SHOWNORMAL);
+            if (!ShellExecuteSilent(hwndDlg, g_sdata.input_script)) {
+              TCHAR app[MAX_PATH];
+              if (GetWindowsDirectory(app, COUNTOF(app))) {
+                lstrcat(app,_T("\\notepad.exe"));
+                ShellExecuteWithErrorBox(hwndDlg, app, g_sdata.input_script);
               }
             }
           }

Contrib/Makensisw/makensisw.h

@@ -57,7 +57,7 @@ static inline bool IsWin95() { return SupportsW95() && (GetVersion() & (0x8000FF
 #define CONTRIB      _T("Fritz Elfert, Justin Frankel, Amir Szekely, Sunil Kamath, Joost Verburg, Anders Kjersem")
 #define DONATE       _T("<A>Donate</A> to support NSIS development.")
 #define DONATEURL    { 'h'|x,'t','t'|x,'p',':'|x,'/'|x,'/'|x,'n'|x,'s'|x,'i'|x,'s'|x,'.'|x,'s'|x,'f'|x,'.','n'|x,'e'|x,'t'|x,'/'|x,'r','/'|x,'D'|x,'o'|x,'n'|x,'a'|x,'t'|x,'e'|x,'\0' } // "Encrypted"
-#define DOCPATH      "https://nsis.sourceforge.io/Docs/"
+#define DOCURL       "https://nsis.sourceforge.io/Docs/"
 #define LOCALDOCS    _T("\\NSIS.chm")
 #define ERRBOXTITLE  0 //_T("Error")
 #define NSISERROR    _T("Unable to initialize MakeNSIS. Please verify that makensis.exe is in the same directory as makensisw.exe.")

Contrib/Makensisw/utils.cpp

@@ -700,6 +700,19 @@ void ResetSymbols() {
   g_sdata.symbols = NULL;
 }
 
+BOOL ShellExecuteWithErrorBox(HWND hWnd, LPCTSTR File, LPCTSTR Parameters) {
+  SHELLEXECUTEINFO sei;
+  sei.cbSize = sizeof(SHELLEXECUTEINFO);
+  sei.fMask = SEE_MASK_FLAG_DDEWAIT;
+  if (!(sei.hwnd = hWnd)) sei.fMask |= SEE_MASK_FLAG_NO_UI;
+  sei.lpVerb = NULL;
+  sei.lpFile = File;
+  sei.lpParameters = Parameters;
+  sei.lpDirectory = NULL;
+  sei.nShow = SW_SHOW;
+  return ShellExecuteEx(&sei);
+}
+
 void FreeSpawn(PROCESS_INFORMATION *pPI, HANDLE hRd, HANDLE hWr) {
   if (pPI) {
     GetExitCodeProcess(pPI->hProcess, &pPI->dwProcessId);
@@ -824,12 +837,12 @@ LRESULT CALLBACK TipHookProc(int nCode, WPARAM wParam, LPARAM lParam) {
 
 void ShowDocs() {
   TCHAR pathf[MAX_PATH],*path;
-  GetModuleFileName(NULL,pathf,sizeof(pathf));
+  GetModuleFileName(NULL,pathf,COUNTOF(pathf));
   path=_tcsrchr(pathf,_T('\\'));
   if(path!=NULL) *path=0;
   lstrcat(pathf,LOCALDOCS);
-  if ((int)(INT_PTR) ShellExecute(g_sdata.hwnd,_T("open"),pathf,NULL,NULL,SW_SHOWNORMAL) <= 32) 
-    ShellExecuteA(g_sdata.hwnd,"open",DOCPATH,NULL,NULL,SW_SHOWNORMAL);
+  if (!ShellExecuteSilent(g_sdata.hwnd, pathf))
+    OpenUrlInDefaultBrowser(g_sdata.hwnd, DOCURL);
 }
 
 TCHAR* BuildSymbols()

Contrib/Makensisw/utils.h

@@ -60,6 +60,8 @@ static inline UINT SizeOfStruct(const TOOLINFO&x) { return FIELD_OFFSET(TOOLINFO
 static inline UINT SizeOfStruct(const OPENFILENAME&x) { return sizeof(void*) < 8 ? 76 : sizeof(x); }
 UINT GetScreenBPP(HWND hWnd = NULL);
 
+BOOL ShellExecuteWithErrorBox(HWND hWnd, LPCTSTR File, LPCTSTR Parameters = NULL);
+inline BOOL ShellExecuteSilent(HWND hWnd, LPCTSTR File) { return ShellExecuteWithErrorBox(NULL, File); }
 void FreeSpawn(PROCESS_INFORMATION *pPI, HANDLE hRd, HANDLE hWr);
 BOOL InitSpawn(STARTUPINFO &si, HANDLE &hRd, HANDLE &hWr);