win32: use lazy loading for certain DLLs

Only a handful of functions are used from shell32.dll, userenv.dll
and psapi.dll.  Mostly these functions are in out of the way places.

By loading the functions only when required we can avoid the startup
cost of linking the three DLLs in the common case that they aren't
needed.

5 files changed, 43 insertions, 24 deletions

diff --git a/Makefile.flags b/Makefile.flags
index dddeb0ce6..26031f561 100644
--- a/Makefile.flags
+++ b/Makefile.flags
@@ -146,7 +146,7 @@ endif
 ifeq ($(CONFIG_PLATFORM_MINGW32),y)
 CFLAGS += -Iwin32 -DHAVE_STRING_H=1 -DHAVE_CONFIG_H=0 -fno-builtin-stpcpy -fno-ident
 EXEEXT = .exe
-LDLIBS += userenv psapi ws2_32
+LDLIBS += ws2_32
 endif
 
 ifneq ($(CONFIG_PLATFORM_MINGW32),y)
diff --git a/loginutils/suw32.c b/loginutils/suw32.c
index de29f423a..3500c08db 100644
--- a/loginutils/suw32.c
+++ b/loginutils/suw32.c
@@ -22,6 +22,7 @@
 //usage:     "\n    -c CMD  Command to pass to 'sh -c'"
 
 #include "libbb.h"
+#include "lazyload.h"
 
 int suw32_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int suw32_main(int argc UNUSED_PARAM, char **argv)
@@ -29,6 +30,7 @@ int suw32_main(int argc UNUSED_PARAM, char **argv)
         char *opt_command = NULL;
         SHELLEXECUTEINFO info;
         char *bb_path, *cwd;
+        DECLARE_PROC_ADDR(BOOL, ShellExecuteExA, SHELLEXECUTEINFOA *);
 
         getopt32(argv, "c:", &opt_command);
         if (argv[optind])
@@ -63,5 +65,8 @@ int suw32_main(int argc UNUSED_PARAM, char **argv)
         /* info.lpDirectory = NULL; */
         info.nShow = SW_SHOWNORMAL;
 
-        return !ShellExecuteEx(&info);
+        if (!INIT_PROC_ADDR(shell32.dll, ShellExecuteExA))
+                return -1;
+
+        return !ShellExecuteExA(&info);
 }
diff --git a/win32/lazyload.h b/win32/lazyload.h
index a9fcff209..034bc7e45 100644
--- a/win32/lazyload.h
+++ b/win32/lazyload.h
@@ -21,19 +21,7 @@ struct proc_addr {
 #define INIT_PROC_ADDR(dll, function) \
         (function = get_proc_addr(#dll, #function, &proc_addr_##function))
 
-static inline void *get_proc_addr(const char *dll, const char *function, struct proc_addr *proc)
-{
-        /* only do this once */
-        if (!proc->initialized) {
-                HANDLE hnd = LoadLibraryExA(dll, NULL, LOAD_LIBRARY_SEARCH_SYSTEM32);
-                if (hnd)
-                        proc->pfunction = GetProcAddress(hnd, function);
-                proc->initialized = 1;
-        }
-        /* set ENOSYS if DLL or function was not found */
-        if (!proc->pfunction)
-                errno = ENOSYS;
-        return proc->pfunction;
-}
+void *get_proc_addr(const char *dll, const char *function,
+                                        struct proc_addr *proc);
 
 #endif
diff --git a/win32/mingw.c b/win32/mingw.c
index 5c4c39b9d..105b7864d 100644
--- a/win32/mingw.c
+++ b/win32/mingw.c
@@ -837,17 +837,17 @@ static char *gethomedir(void)
         static char *buf = NULL;
         DWORD len = PATH_MAX;
         HANDLE h;
+        DECLARE_PROC_ADDR(BOOL, GetUserProfileDirectoryA, HANDLE, LPSTR, LPDWORD);
 
-        if (!buf)
-                buf = xzalloc(PATH_MAX);
-
-        if (buf[0])
+        if (buf)
                 return buf;
 
+        buf = xzalloc(PATH_MAX);
         if ( !OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &h) )
                 return buf;
 
-        GetUserProfileDirectory(h, buf, &len);
+        if (INIT_PROC_ADDR(userenv.dll, GetUserProfileDirectoryA))
+                GetUserProfileDirectoryA(h, buf, &len);
         CloseHandle(h);
         return bs_to_slash(buf);
 }
@@ -1027,7 +1027,6 @@ int link(const char *oldpath, const char *newpath)
                                                 LPSECURITY_ATTRIBUTES);
 
         if (!INIT_PROC_ADDR(kernel32.dll, CreateHardLinkA)) {
-                errno = ENOSYS;
                 return -1;
         }
         if (!CreateHardLinkA(newpath, oldpath, NULL)) {
@@ -1767,3 +1766,19 @@ void make_sparse(int fd, off_t start, off_t end)
         DeviceIoControl(fh, FSCTL_SET_ZERO_DATA, &fzdi, sizeof(fzdi),
                                          NULL, 0, &dwTemp, NULL);
 }
+
+void *get_proc_addr(const char *dll, const char *function,
+                                        struct proc_addr *proc)
+{
+        /* only do this once */
+        if (!proc->initialized) {
+                HANDLE hnd = LoadLibraryExA(dll, NULL, LOAD_LIBRARY_SEARCH_SYSTEM32);
+                if (hnd)
+                        proc->pfunction = GetProcAddress(hnd, function);
+                proc->initialized = 1;
+        }
+        /* set ENOSYS if DLL or function was not found */
+        if (!proc->pfunction)
+                errno = ENOSYS;
+        return proc->pfunction;
+}
diff --git a/win32/process.c b/win32/process.c
index 04775100b..5833a0323 100644
--- a/win32/process.c
+++ b/win32/process.c
@@ -446,6 +446,17 @@ static char *get_bb_string(DWORD pid, const char *exe, char *string)
         char exepath[PATH_MAX];
         char *name = NULL;
         int i;
+        DECLARE_PROC_ADDR(DWORD, GetProcessImageFileNameA, HANDLE,
+                                                        LPSTR, DWORD);
+        DECLARE_PROC_ADDR(BOOL, EnumProcessModules, HANDLE, HMODULE *,
+                                                        DWORD, LPDWORD);
+        DECLARE_PROC_ADDR(DWORD, GetModuleFileNameExA, HANDLE, HMODULE,
+                                                        LPSTR, DWORD);
+
+        if (!INIT_PROC_ADDR(psapi.dll, GetProcessImageFileNameA) ||
+                        !INIT_PROC_ADDR(psapi.dll, EnumProcessModules) ||
+                        !INIT_PROC_ADDR(psapi.dll, GetModuleFileNameExA))
+                return NULL;
 
         if (!(proc=OpenProcess(PROCESS_QUERY_INFORMATION|PROCESS_VM_READ,
                                                         FALSE, pid))) {
@@ -453,7 +464,7 @@ static char *get_bb_string(DWORD pid, const char *exe, char *string)
         }
 
         if (exe == NULL) {
-                if (GetProcessImageFileName(proc, exepath, PATH_MAX) != 0) {
+                if (GetProcessImageFileNameA(proc, exepath, PATH_MAX) != 0) {
                         exe = bb_basename(exepath);
                 }
         }
@@ -470,7 +481,7 @@ static char *get_bb_string(DWORD pid, const char *exe, char *string)
 
         for (i=0; exe != NULL && i<needed/sizeof(HMODULE); ++i) {
                 char modname[MAX_PATH];
-                if (GetModuleFileNameEx(proc, mlist[i], modname, sizeof(modname))) {
+                if (GetModuleFileNameExA(proc, mlist[i], modname, sizeof(modname))) {
                         if (strcasecmp(bb_basename(modname), exe) == 0) {
                                 break;
                         }