[PATCH v2 2/7] Windows: boost startup by avoiding a static dependency on shell32.dll

From: Johannes Sixt <j6t@kdbg.org>
Date: Jan 15, 2010, 20:12 UTC
Message-ID: <3b94470985e76dccc0b19174452de4c97a8309b1.1263584975.git.j6t@kdbg.org>
In-Reply-To: <cover.1262895936.git.j6t@kdbg.org>

This DLL is only needed to invoke the browser in a "git help" call. By looking up the only function that we need at runtime, we can avoid the startup costs of this DLL.

DLL usage can be profiled with Microsoft's Dependency Walker. For example, a call to "git diff-files" loaded

before: 19 DLLs after: 9 DLLs

As a result, the runtime of 'make -j2 test' went down from 16:00min to 12:40min on one of my boxes.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
---
 No changes.

 compat/mingw.c |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/compat/mingw.c b/compat/mingw.c
index 0d73f15..2afc978 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -3,8 +3,6 @@
 #include <conio.h>
 #include "../strbuf.h"
 
-#include <shellapi.h>
-
 static int err_win_to_posix(DWORD winerr)
 {
 	int error = ENOSYS;
@@ -1338,8 +1336,22 @@ static const char *make_backslash_path(const char *path)
 void mingw_open_html(const char *unixpath)
 {
 	const char *htmlpath = make_backslash_path(unixpath);
+	typedef HINSTANCE (WINAPI *T)(HWND, const char *,
+			const char *, const char *, const char *, INT);
+	T ShellExecute;
+	HMODULE shell32;
+
+	shell32 = LoadLibrary("shell32.dll");
+	if (!shell32)
+		die("cannot load shell32.dll");
+	ShellExecute = (T)GetProcAddress(shell32, "ShellExecuteA");
+	if (!ShellExecute)
+		die("cannot run browser");
+
 	printf("Launching default browser to display HTML ...\n");
 	ShellExecute(NULL, "open", htmlpath, NULL, "\\", 0);
+
+	FreeLibrary(shell32);
 }
 
 int link(const char *oldpath, const char *newpath)

-- 
1.6.6.218.g3e6eb