1 files changed, 55 insertions, 0 deletions
diff --git a/os/win32/os.h b/os/win32/os.h
index c6f6200f00..a05b42c0e8 100644
--- a/os/win32/os.h
+++ b/os/win32/os.h
@@ -97,8 +97,63 @@ AP_DECLARE_DATA extern int real_exit_code;
 #define exit(status) ((exit)((real_exit_code==2) ? (real_exit_code = (status)) \
                                                  : ((real_exit_code = 0), (status))))
 
+
+/* Defined in util_win32.c
+ */
+
 AP_DECLARE(apr_status_t) ap_os_proc_filepath(char **binpath, apr_pool_t *p);
 
+typedef enum {
+    AP_DLL_WINBASEAPI = 0,    // kernel32 From WinBase.h
+    AP_DLL_WINADVAPI = 1,     // advapi32 From WinBase.h
+    AP_DLL_WINSOCKAPI = 2,    // mswsock  From WinSock.h
+    AP_DLL_WINSOCK2API = 3,   // ws2_32   From WinSock2.h
+    AP_DLL_defined = 4        // must define as last idx_ + 1
+} ap_dlltoken_e;
+
+FARPROC ap_load_dll_func(ap_dlltoken_e fnLib, char* fnName, int ordinal);
+
+PSECURITY_ATTRIBUTES GetNullACL();
+void CleanNullACL(void *sa);
+
+DWORD wait_for_many_objects(DWORD nCount, CONST HANDLE *lpHandles, 
+                            DWORD dwSeconds);
+
+int set_listeners_noninheritable(apr_pool_t *p);
+
+
+#define AP_DECLARE_LATE_DLL_FUNC(lib, rettype, calltype, fn, ord, args, names) \
+    typedef rettype (calltype *ap_winapi_fpt_##fn) args; \
+    static ap_winapi_fpt_##fn ap_winapi_pfn_##fn = NULL; \
+    __inline rettype ap_winapi_##fn args \
+    {   if (!ap_winapi_pfn_##fn) \
+            ap_winapi_pfn_##fn = (ap_winapi_fpt_##fn) ap_load_dll_func(lib, #fn, ord); \
+        return (*(ap_winapi_pfn_##fn)) names; }; \
+
+/* Win2K kernel only */
+AP_DECLARE_LATE_DLL_FUNC(AP_DLL_WINADVAPI, BOOL, WINAPI, ChangeServiceConfig2A, 0, (
+    SC_HANDLE hService, 
+    DWORD dwInfoLevel, 
+    LPVOID lpInfo),
+    (hService, dwInfoLevel, lpInfo));
+#undef ChangeServiceConfig2
+#define ChangeServiceConfig2 ap_winapi_ChangeServiceConfig2A
+
+/* WinNT kernel only */
+AP_DECLARE_LATE_DLL_FUNC(AP_DLL_WINBASEAPI, BOOL, WINAPI, CancelIo, 0, (
+    IN HANDLE hFile),
+    (hFile));
+#undef CancelIo
+#define CancelIo ap_winapi_CancelIo
+
+/* Win9x kernel only */
+AP_DECLARE_LATE_DLL_FUNC(AP_DLL_WINBASEAPI, DWORD, WINAPI, RegisterServiceProcess, 0, (
+    DWORD dwProcessId,
+    DWORD dwType),
+    (dwProcessId, dwType));
+#define RegisterServiceProcess ap_winapi_RegisterServiceProcess
+
+
 #ifdef __cplusplus
 }
 #endif