From: Pat Thoyts <patthoyts@users.sourceforge.net>
Date: Thu, 18 Mar 2010 21:45:19 +0000 (+0000)
Subject: MinGW: Report errors when failing to launch the html browser.
X-Git-Tag: v1.7.4-rc0~193^2~11
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=442dada22d3b6e511d30b05a80bab153619e52a7;p=git.git

MinGW: Report errors when failing to launch the html browser.

The mingw function to launch the system html browser is silent if the
target file does not exist leaving the user confused. Make it display
something.

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Reviewed-by: Erik Faye-Lund <kusmabite@gmail.com>
---

diff --git a/compat/mingw.c b/compat/mingw.c
index ee8f3be5b..431e32265 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -1417,6 +1417,7 @@ void mingw_open_html(const char *unixpath)
 			const char *, const char *, const char *, INT);
 	T ShellExecute;
 	HMODULE shell32;
+	int r;
 
 	shell32 = LoadLibrary("shell32.dll");
 	if (!shell32)
@@ -1426,9 +1427,12 @@ void mingw_open_html(const char *unixpath)
 		die("cannot run browser");
 
 	printf("Launching default browser to display HTML ...\n");
-	ShellExecute(NULL, "open", htmlpath, NULL, "\\", 0);
-
+	r = (int)ShellExecute(NULL, "open", htmlpath, NULL, "\\", SW_SHOWNORMAL);
 	FreeLibrary(shell32);
+	/* see the MSDN documentation referring to the result codes here */
+	if (r <= 32) {
+		die("failed to launch browser for %.*s", MAX_PATH, unixpath);
+	}
 }
 
 int link(const char *oldpath, const char *newpath)