1 files changed, 11 insertions, 15 deletions

diff --git a/win32/lazyload.h b/win32/lazyload.h
index 9d1a05550..a9fcff209 100644
--- a/win32/lazyload.h
+++ b/win32/lazyload.h
@@ -4,35 +4,31 @@
 /* simplify loading of DLL functions */
 
 struct proc_addr {
-        const char *const dll;
-        const char *const function;
         FARPROC pfunction;
-        unsigned initialized : 1;
+        unsigned initialized;
 };
 
 /* Declares a function to be loaded dynamically from a DLL. */
-#define DECLARE_PROC_ADDR(dll, rettype, function, ...) \
-        static struct proc_addr proc_addr_##function = \
-        { #dll, #function, NULL, 0 }; \
-        static rettype (WINAPI *function)(__VA_ARGS__)
+#define DECLARE_PROC_ADDR(rettype, function, ...) \
+        static struct proc_addr proc_addr_##function = { NULL, 0 }; \
+        rettype (WINAPI *function)(__VA_ARGS__)
 
 /*
  * Loads a function from a DLL (once-only).
  * Returns non-NULL function pointer on success.
- * Returns NULL + errno == ENOSYS on failure.
+ * Returns NULL and sets errno == ENOSYS on failure.
  */
-#define INIT_PROC_ADDR(function) (function = get_proc_addr(&proc_addr_##function))
+#define INIT_PROC_ADDR(dll, function) \
+        (function = get_proc_addr(#dll, #function, &proc_addr_##function))
 
-static inline void *get_proc_addr(struct proc_addr *proc)
+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;
-                proc->initialized = 1;
-                hnd = LoadLibraryExA(proc->dll, NULL,
-                                     LOAD_LIBRARY_SEARCH_SYSTEM32);
+                HANDLE hnd = LoadLibraryExA(dll, NULL, LOAD_LIBRARY_SEARCH_SYSTEM32);
                 if (hnd)
-                        proc->pfunction = GetProcAddress(hnd, proc->function);
+                        proc->pfunction = GetProcAddress(hnd, function);
+                proc->initialized = 1;
         }
         /* set ENOSYS if DLL or function was not found */
         if (!proc->pfunction)