Here it is, the Win32 part of the big canonical errors patch.

  The reason is really, really simple.  If we ever choose to mix clib and
  dos error codes, they criss-cross and don't line up, but they share the
  same number space.  As I wrote the new APR_IS_ERROR macros, I realized
  we were about to shoot ourselves in the foot.

  These changes nearly entirely affect Win32 only.  The next big patch will
  affect all of the rv == APR_ENOENT type problems throughout the system.

PR:
Obtained from:
Submitted by:
Reviewed by:

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86416 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/arch/win32/mod_isapi.c b/modules/arch/win32/mod_isapi.c
index 6e7e39fb01c50f360eea929ac75db3ba71814872..9470b27d85188e24df3a23eddac3900869bf02b2 100644 (file)
--- a/modules/arch/win32/mod_isapi.c
+++ b/modules/arch/win32/mod_isapi.c
@@ -280,8 +280,8 @@ static apr_status_t isapi_load(apr_pool_t *p, isapi_server_conf *sconf,
 
     if (!(*isa)->handle)
     {
-        apr_status_t rv = GetLastError();
-        ap_log_rerror(APLOG_MARK, APLOG_ALERT, GetLastError(), r,
+        apr_status_t rv = apr_get_os_error();
+        ap_log_rerror(APLOG_MARK, APLOG_ALERT, apr_get_os_error(), r,
                       "ISAPI %s failed to load", fpath);
         (*isa)->handle = NULL;
         return rv;
@@ -290,7 +290,7 @@ static apr_status_t isapi_load(apr_pool_t *p, isapi_server_conf *sconf,
     if (!((*isa)->GetExtensionVersion = (void *)(GetProcAddress((*isa)->handle,
                                                       "GetExtensionVersion"))))
     {
-        apr_status_t rv = GetLastError();
+        apr_status_t rv = apr_get_os_error();
         ap_log_rerror(APLOG_MARK, APLOG_ALERT, rv, r,
                       "ISAPI %s is missing GetExtensionVersion()",
                       fpath);
@@ -302,7 +302,7 @@ static apr_status_t isapi_load(apr_pool_t *p, isapi_server_conf *sconf,
     if (!((*isa)->HttpExtensionProc = (void *)(GetProcAddress((*isa)->handle,
                                                        "HttpExtensionProc")))) 
     {
-        apr_status_t rv = GetLastError();
+        apr_status_t rv = apr_get_os_error();
         ap_log_rerror(APLOG_MARK, APLOG_ALERT, rv, r,
                       "ISAPI %s is missing HttpExtensionProc()",
                       fpath);
@@ -318,7 +318,7 @@ static apr_status_t isapi_load(apr_pool_t *p, isapi_server_conf *sconf,
 
     /* Run GetExtensionVersion() */
     if (!((*isa)->GetExtensionVersion)((*isa)->pVer)) {
-        apr_status_t rv = GetLastError();
+        apr_status_t rv = apr_get_os_error();
         ap_log_rerror(APLOG_MARK, APLOG_ALERT, rv, r,
                       "ISAPI %s call GetExtensionVersion() failed", 
                       fpath);
@@ -688,8 +688,8 @@ BOOL WINAPI ReadClient (HCONN ConnID, LPVOID lpvBuffer, LPDWORD lpdwSize)
                                        *lpdwSize - read)) > 0)) {
         if (res < 0) {
             *lpdwSize = 0;
-            if (!GetLastError())
-                SetLastError(TODO_ERROR); /* XXX: Find the right error code */
+            if (!apr_get_os_error())
+                apr_set_os_error(TODO_ERROR); /* XXX: Find the right error code */
             return FALSE;
         }
 

diff --git a/modules/http/http_core.c b/modules/http/http_core.c
index 6c8f8fdbc4a27f1d4725959f4bc7551e317d9c7e..759901e1ddf1b4c11592066c8e2f24930f1bd10a 100644 (file)
--- a/modules/http/http_core.c
+++ b/modules/http/http_core.c
@@ -795,8 +795,9 @@ API_EXPORT(unsigned long) ap_get_limit_req_body(const request_rec *r)
 }
 
 #ifdef WIN32
-static DWORD get_win32_registry_default_value(apr_pool_t *p, HKEY hkey, 
-                                              char* relativepath, char **value)
+static apr_status_t get_win32_registry_default_value(apr_pool_t *p, HKEY hkey,
+                                                     char* relativepath, 
+                                                     char **value)
 {
     HKEY hkeyOpen;
     DWORD type;
@@ -805,7 +806,7 @@ static DWORD get_win32_registry_default_value(apr_pool_t *p, HKEY hkey,
                                 KEY_QUERY_VALUE, &hkeyOpen);
     
     if (result != ERROR_SUCCESS) 
-        return result;
+        return APR_FROM_OS_ERROR(result);
 
     /* Read to NULL buffer to determine value size */
     result = RegQueryValueEx(hkeyOpen, "", 0, &type, NULL, &size);
@@ -836,7 +837,7 @@ static DWORD get_win32_registry_default_value(apr_pool_t *p, HKEY hkey,
     }
 
     RegCloseKey(hkeyOpen);
-    return result;
+    return APR_FROM_OS_ERROR(result);
 }
 
 static char* get_interpreter_from_win32_registry(apr_pool_t *p, const char* ext,

diff --git a/os/win32/mod_isapi.c b/os/win32/mod_isapi.c
index 6e7e39fb01c50f360eea929ac75db3ba71814872..9470b27d85188e24df3a23eddac3900869bf02b2 100644 (file)
--- a/os/win32/mod_isapi.c
+++ b/os/win32/mod_isapi.c
@@ -280,8 +280,8 @@ static apr_status_t isapi_load(apr_pool_t *p, isapi_server_conf *sconf,
 
     if (!(*isa)->handle)
     {
-        apr_status_t rv = GetLastError();
-        ap_log_rerror(APLOG_MARK, APLOG_ALERT, GetLastError(), r,
+        apr_status_t rv = apr_get_os_error();
+        ap_log_rerror(APLOG_MARK, APLOG_ALERT, apr_get_os_error(), r,
                       "ISAPI %s failed to load", fpath);
         (*isa)->handle = NULL;
         return rv;
@@ -290,7 +290,7 @@ static apr_status_t isapi_load(apr_pool_t *p, isapi_server_conf *sconf,
     if (!((*isa)->GetExtensionVersion = (void *)(GetProcAddress((*isa)->handle,
                                                       "GetExtensionVersion"))))
     {
-        apr_status_t rv = GetLastError();
+        apr_status_t rv = apr_get_os_error();
         ap_log_rerror(APLOG_MARK, APLOG_ALERT, rv, r,
                       "ISAPI %s is missing GetExtensionVersion()",
                       fpath);
@@ -302,7 +302,7 @@ static apr_status_t isapi_load(apr_pool_t *p, isapi_server_conf *sconf,
     if (!((*isa)->HttpExtensionProc = (void *)(GetProcAddress((*isa)->handle,
                                                        "HttpExtensionProc")))) 
     {
-        apr_status_t rv = GetLastError();
+        apr_status_t rv = apr_get_os_error();
         ap_log_rerror(APLOG_MARK, APLOG_ALERT, rv, r,
                       "ISAPI %s is missing HttpExtensionProc()",
                       fpath);
@@ -318,7 +318,7 @@ static apr_status_t isapi_load(apr_pool_t *p, isapi_server_conf *sconf,
 
     /* Run GetExtensionVersion() */
     if (!((*isa)->GetExtensionVersion)((*isa)->pVer)) {
-        apr_status_t rv = GetLastError();
+        apr_status_t rv = apr_get_os_error();
         ap_log_rerror(APLOG_MARK, APLOG_ALERT, rv, r,
                       "ISAPI %s call GetExtensionVersion() failed", 
                       fpath);
@@ -688,8 +688,8 @@ BOOL WINAPI ReadClient (HCONN ConnID, LPVOID lpvBuffer, LPDWORD lpdwSize)
                                        *lpdwSize - read)) > 0)) {
         if (res < 0) {
             *lpdwSize = 0;
-            if (!GetLastError())
-                SetLastError(TODO_ERROR); /* XXX: Find the right error code */
+            if (!apr_get_os_error())
+                apr_set_os_error(TODO_ERROR); /* XXX: Find the right error code */
             return FALSE;
         }
 

diff --git a/server/mpm/winnt/mpm_winnt.c b/server/mpm/winnt/mpm_winnt.c
index bbb540fea48ae72171b39a4ff4a48ae1938aa7cc..bae51228b16fd0141d64d7aba5457572582155cf 100644 (file)
--- a/server/mpm/winnt/mpm_winnt.c
+++ b/server/mpm/winnt/mpm_winnt.c
@@ -198,14 +198,15 @@ static PSECURITY_ATTRIBUTES GetNullACL()
     if (pSD == NULL || sa == NULL) {
         return NULL;
     }
+    apr_set_os_error(0);
     if (!InitializeSecurityDescriptor(pSD, SECURITY_DESCRIPTOR_REVISION)
-       || GetLastError()) {
+       || apr_get_os_error()) {
         LocalFree( pSD );
         LocalFree( sa );
         return NULL;
     }
     if (!SetSecurityDescriptorDacl(pSD, TRUE, (PACL) NULL, FALSE)
-       || GetLastError()) {
+       || apr_get_os_error()) {
         LocalFree( pSD );
         LocalFree( sa );
         return NULL;
@@ -314,13 +315,13 @@ void signal_parent(int type)
        /* Um, problem, can't signal the parent, which means we can't
         * signal ourselves to die. Ignore for now...
         */
-       ap_log_error(APLOG_MARK, APLOG_EMERG, GetLastError(), server_conf,
+       ap_log_error(APLOG_MARK, APLOG_EMERG, apr_get_os_error(), server_conf,
                      "OpenEvent on %s event", signal_name);
        return;
     }
     if (SetEvent(e) == 0) {
        /* Same problem as above */
-       ap_log_error(APLOG_MARK, APLOG_EMERG, GetLastError(), server_conf,
+       ap_log_error(APLOG_MARK, APLOG_EMERG, apr_get_os_error(), server_conf,
                      "SetEvent on %s event", signal_name);
        CloseHandle(e);
        return;
@@ -467,7 +468,7 @@ static int setup_inherited_listeners(server_rec *s)
     for (lr = ap_listeners; lr; lr = lr->next) {
         if (!ReadFile(pipe, &WSAProtocolInfo, sizeof(WSAPROTOCOL_INFO), 
                       &BytesRead, (LPOVERLAPPED) NULL)) {
-            ap_log_error(APLOG_MARK, APLOG_CRIT, GetLastError(), server_conf,
+            ap_log_error(APLOG_MARK, APLOG_CRIT, apr_get_os_error(), server_conf,
                          "setup_inherited_listeners: Unable to read socket data from parent");
             signal_parent(0);  /* tell parent to die */
             exit(1);
@@ -477,7 +478,7 @@ static int setup_inherited_listeners(server_rec *s)
         nsd = WSASocket(FROM_PROTOCOL_INFO, FROM_PROTOCOL_INFO, FROM_PROTOCOL_INFO,
                         &WSAProtocolInfo, 0, 0);
         if (nsd == INVALID_SOCKET) {
-            ap_log_error(APLOG_MARK, APLOG_CRIT, WSAGetLastError(), server_conf,
+            ap_log_error(APLOG_MARK, APLOG_CRIT, apr_get_netos_error(), server_conf,
                          "Child %d: setup_inherited_listeners(), WSASocket failed to open the inherited socket.", my_pid);
             signal_parent(0);  /* tell parent to die */
             exit(1);
@@ -758,7 +759,7 @@ static PCOMP_CONTEXT win9x_get_connection(PCOMP_CONTEXT context)
         /* allocate the completion context and the transaction pool */
         context = apr_pcalloc(pconf, sizeof(COMP_CONTEXT));
         if (!context) {
-            ap_log_error(APLOG_MARK,APLOG_ERR, GetLastError(), server_conf,
+            ap_log_error(APLOG_MARK,APLOG_ERR, apr_get_os_error(), server_conf,
                          "win9x_get_connection: apr_pcalloc() failed. Process will exit.");
             return NULL;
         }
@@ -776,7 +777,7 @@ static PCOMP_CONTEXT win9x_get_connection(PCOMP_CONTEXT context)
         context->sa_server = apr_palloc(context->ptrans, len);
         if (getsockname(context->accept_socket, 
                         context->sa_server, &len)== SOCKET_ERROR) {
-            ap_log_error(APLOG_MARK, APLOG_WARNING, WSAGetLastError(), server_conf, 
+            ap_log_error(APLOG_MARK, APLOG_WARNING, apr_get_netos_error(), server_conf, 
                          "getsockname failed");
             continue;
         }
@@ -784,7 +785,7 @@ static PCOMP_CONTEXT win9x_get_connection(PCOMP_CONTEXT context)
         context->sa_client = apr_palloc(context->ptrans, len);
         if ((getpeername(context->accept_socket,
                          context->sa_client, &len)) == SOCKET_ERROR) {
-            ap_log_error(APLOG_MARK, APLOG_WARNING, WSAGetLastError(), server_conf, 
+            ap_log_error(APLOG_MARK, APLOG_WARNING, apr_get_netos_error(), server_conf, 
                          "getpeername failed");
             memset(&context->sa_client, '\0', sizeof(context->sa_client));
         }
@@ -819,8 +820,8 @@ static void drain_acceptex_complport(HANDLE hComplPort, BOOLEAN bCleanUp)
         rc = GetQueuedCompletionStatus(hComplPort, &BytesRead, &CompKey,
                                        &pol, 1000);
         if (!rc) {
-            rc = GetLastError();
-            if (rc == ERROR_OPERATION_ABORTED) {
+            rc = apr_get_os_error();
+            if (rc == APR_FROM_OS_ERROR(ERROR_OPERATION_ABORTED)) {
                 ap_log_error(APLOG_MARK, APLOG_INFO, APR_SUCCESS, server_conf,
                              "Child %d: - Draining an ABORTED packet off "
                              "the AcceptEx completion port.", my_pid);
@@ -849,7 +850,7 @@ static int create_acceptex_context(apr_pool_t *_pconf, ap_listen_rec *lr)
     /* allocate the completion context */
     context = apr_pcalloc(_pconf, sizeof(COMP_CONTEXT));
     if (!context) {
-        ap_log_error(APLOG_MARK,APLOG_ERR, GetLastError(), server_conf,
+        ap_log_error(APLOG_MARK,APLOG_ERR, apr_get_os_error(), server_conf,
                      "create_acceptex_context: apr_pcalloc() failed. Process will exit.");
         return -1;
     }
@@ -858,7 +859,7 @@ static int create_acceptex_context(apr_pool_t *_pconf, ap_listen_rec *lr)
     context->lr = lr;
     context->Overlapped.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); 
     if (context->Overlapped.hEvent == NULL) {
-        ap_log_error(APLOG_MARK,APLOG_ERR, GetLastError(), server_conf,
+        ap_log_error(APLOG_MARK,APLOG_ERR, apr_get_os_error(), server_conf,
                      "create_acceptex_context: CreateEvent() failed. Process will exit.");
         return -1;
     }
@@ -867,7 +868,7 @@ static int create_acceptex_context(apr_pool_t *_pconf, ap_listen_rec *lr)
     apr_get_os_sock(&nsd, context->lr->sd);
     context->accept_socket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
     if (context->accept_socket == INVALID_SOCKET) {
-        ap_log_error(APLOG_MARK,APLOG_ERR, WSAGetLastError(), server_conf,
+        ap_log_error(APLOG_MARK,APLOG_ERR, apr_get_netos_error(), server_conf,
                      "create_acceptex_context: socket() failed. Process will exit.");
         return -1;
     }
@@ -876,7 +877,7 @@ static int create_acceptex_context(apr_pool_t *_pconf, ap_listen_rec *lr)
     if (setsockopt(context->accept_socket, SOL_SOCKET,
                    SO_UPDATE_ACCEPT_CONTEXT, (char *)&nsd,
                    sizeof(nsd))) {
-        ap_log_error(APLOG_MARK, APLOG_ERR, WSAGetLastError(), server_conf,
+        ap_log_error(APLOG_MARK, APLOG_ERR, apr_get_netos_error(), server_conf,
                      "setsockopt(SO_UPDATE_ACCEPT_CONTEXT) failed.");
         /* Not a failure condition. Keep running. */
     }
@@ -895,9 +896,9 @@ static int create_acceptex_context(apr_pool_t *_pconf, ap_listen_rec *lr)
                   PADDED_ADDR_SIZE, PADDED_ADDR_SIZE,
                   &BytesRead,
                   (LPOVERLAPPED) context)) {
-        lasterror = WSAGetLastError();
-        if (lasterror != ERROR_IO_PENDING) {
-            ap_log_error(APLOG_MARK,APLOG_ERR, WSAGetLastError(), server_conf,
+        lasterror = apr_get_netos_error();
+        if (lasterror != APR_FROM_OS_ERROR(ERROR_IO_PENDING)) {
+            ap_log_error(APLOG_MARK,APLOG_ERR, lasterror, server_conf,
                          "create_acceptex_context: AcceptEx failed. Process will exit.");
             return -1;
         }
@@ -935,7 +936,7 @@ static apr_inline apr_status_t reset_acceptex_context(PCOMP_CONTEXT context)
         if (context->accept_socket == INVALID_SOCKET) {
             context->accept_socket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
             if (context->accept_socket == INVALID_SOCKET) {
-                rc = WSAGetLastError();
+                rc = apr_get_netos_error();
                 ap_log_error(APLOG_MARK,APLOG_ERR, rc, server_conf,
                              "reset_acceptex_context: socket() failed. Process will exit.");
                 return rc;
@@ -944,7 +945,7 @@ static apr_inline apr_status_t reset_acceptex_context(PCOMP_CONTEXT context)
             /* SO_UPDATE_ACCEPT_CONTEXT is required for shutdown() to work */
             if (setsockopt(context->accept_socket, SOL_SOCKET,
                            SO_UPDATE_ACCEPT_CONTEXT, (char *)&nsd, sizeof(nsd))) {
-                ap_log_error(APLOG_MARK, APLOG_WARNING, WSAGetLastError(),
+                ap_log_error(APLOG_MARK, APLOG_WARNING, apr_get_netos_error(),
                              server_conf,
                              "setsockopt(SO_UPDATE_ACCEPT_CONTEXT) failed.");
             }
@@ -953,8 +954,8 @@ static apr_inline apr_status_t reset_acceptex_context(PCOMP_CONTEXT context)
         if (!AcceptEx(nsd, context->accept_socket, context->recv_buf, 0,
                       PADDED_ADDR_SIZE, PADDED_ADDR_SIZE, &BytesRead, 
                       (LPOVERLAPPED) context)) {
-            rc = WSAGetLastError();
-            if (rc != ERROR_IO_PENDING) {
+            rc = apr_get_netos_error();
+            if (rc != APR_FROM_OS_ERROR(ERROR_IO_PENDING)) {
                 ap_log_error(APLOG_MARK, APLOG_INFO, rc, server_conf,
                              "reset_acceptex_context: AcceptEx failed for "
                              "listening socket: %d and accept socket: %d", 
@@ -1012,8 +1013,8 @@ static PCOMP_CONTEXT winnt_get_connection(PCOMP_CONTEXT context)
         rc = GetQueuedCompletionStatus(AcceptExCompPort, &BytesRead, &CompKey,
                                        &pol, INFINITE);
         if (!rc) {
-            rc = GetLastError();
-            if (rc != ERROR_OPERATION_ABORTED) {
+            rc = apr_get_os_error();
+            if (rc != APR_FROM_OS_ERROR(ERROR_OPERATION_ABORTED)) {
                 /* Is this a deadly condition? 
                  * We sometimes get ERROR_NETNAME_DELETED when a client
                  * disconnects when attempting to reuse sockets. Not sure why 
@@ -1188,7 +1189,7 @@ static void create_listeners()
     for (lr = ap_listeners; lr != NULL; lr = lr->next) {
         while (lr->count < NUM_LISTENERS) {
             if (create_acceptex_context(pconf, lr) == -1) {
-                ap_log_error(APLOG_MARK,APLOG_ERR, GetLastError(), server_conf,
+                ap_log_error(APLOG_MARK,APLOG_ERR, apr_get_os_error(), server_conf,
                              "Unable to create an AcceptEx completion context -- process will exit");
                 signal_parent(0);      /* tell parent to die */
             }
@@ -1309,7 +1310,7 @@ static void child_main()
         cld = rv - WAIT_OBJECT_0;
         if (rv == WAIT_FAILED) {
             /* Something serious is wrong */
-            ap_log_error(APLOG_MARK, APLOG_CRIT, GetLastError(), server_conf,
+            ap_log_error(APLOG_MARK, APLOG_CRIT, apr_get_os_error(), server_conf,
                          "Child %d: WAIT_FAILED -- shutting down server");
             break;
         }
@@ -1506,7 +1507,7 @@ static int create_process(apr_pool_t *p, HANDLE *handles, HANDLE *events, int *p
                      "Parent: Path to Apache process too long");
         return -1;
     } else if (rv == 0) {
-        ap_log_error(APLOG_MARK, APLOG_CRIT, GetLastError(), server_conf,
+        ap_log_error(APLOG_MARK, APLOG_CRIT, apr_get_os_error(), server_conf,
                      "Parent: GetModuleFileName() returned NULL for current process.");
         return -1;
     }
@@ -1544,7 +1545,7 @@ static int create_process(apr_pool_t *p, HANDLE *handles, HANDLE *events, int *p
     pEnvVar = '\0';
     /* Create a pipe to send socket info to the child */
     if (!CreatePipe(&hPipeRead, &hPipeWrite, &sa, 0)) {
-        ap_log_error(APLOG_MARK, APLOG_CRIT, GetLastError(), server_conf,
+        ap_log_error(APLOG_MARK, APLOG_CRIT, apr_get_os_error(), server_conf,
                      "Parent: Unable to create pipe to child process.");
         return -1;
     }
@@ -1565,7 +1566,7 @@ static int create_process(apr_pool_t *p, HANDLE *handles, HANDLE *events, int *p
                        pEnvBlock,          /* Environment block */
                        NULL,
                        &si, &pi)) {
-        ap_log_error(APLOG_MARK, APLOG_CRIT, GetLastError(), server_conf,
+        ap_log_error(APLOG_MARK, APLOG_CRIT, apr_get_os_error(), server_conf,
                      "Parent: Not able to create the child process.");
         /*
          * We must close the handles to the new process and its main thread
@@ -1587,7 +1588,7 @@ static int create_process(apr_pool_t *p, HANDLE *handles, HANDLE *events, int *p
     sa.lpSecurityDescriptor = NULL;        
     kill_event = CreateEvent(&sa, TRUE, FALSE, apr_psprintf(pconf,"apC%d", pi.dwProcessId));
     if (!kill_event) {
-        ap_log_error(APLOG_MARK, APLOG_CRIT, GetLastError(), server_conf,
+        ap_log_error(APLOG_MARK, APLOG_CRIT, apr_get_os_error(), server_conf,
                      "Parent: Could not create exit event for child process");
         CloseHandle(pi.hProcess);
         CloseHandle(pi.hThread);
@@ -1622,7 +1623,7 @@ static int create_process(apr_pool_t *p, HANDLE *handles, HANDLE *events, int *p
         if (!WriteFile(hPipeWrite, lpWSAProtocolInfo, (DWORD) sizeof(WSAPROTOCOL_INFO),
                        &BytesWritten,
                        (LPOVERLAPPED) NULL)) {
-            ap_log_error(APLOG_MARK, APLOG_CRIT, GetLastError(), server_conf,
+            ap_log_error(APLOG_MARK, APLOG_CRIT, apr_get_os_error(), server_conf,
                          "Parent: Unable to write duplicated socket %d to the child.", lr->sd );
             return -1;
         }
@@ -1634,7 +1635,7 @@ static int create_process(apr_pool_t *p, HANDLE *handles, HANDLE *events, int *p
         if (!DuplicateHandle(GetCurrentProcess(), AcceptExCompPort, 
                              pi.hProcess, &hDupedCompPort,  0,
                              TRUE, DUPLICATE_SAME_ACCESS)) {
-            ap_log_error(APLOG_MARK, APLOG_CRIT, GetLastError(), server_conf,
+            ap_log_error(APLOG_MARK, APLOG_CRIT, apr_get_os_error(), server_conf,
                          "Parent: Unable to duplicate AcceptEx completion port. Shutting down.");
             return -1;
         }
@@ -1670,7 +1671,7 @@ static int master_main(server_rec *s, HANDLE shutdown_event, HANDLE restart_even
     while (remaining_children_to_start--) {
         if (create_process(pconf, process_handles, process_kill_events, 
                            &current_live_processes) < 0) {
-            ap_log_error(APLOG_MARK, APLOG_CRIT, GetLastError(), server_conf,
+            ap_log_error(APLOG_MARK, APLOG_CRIT, apr_get_os_error(), server_conf,
                          "master_main: create child process failed. Exiting.");
             shutdown_pending = 1;
             goto die_now;
@@ -1691,13 +1692,13 @@ static int master_main(server_rec *s, HANDLE shutdown_event, HANDLE restart_even
     cld = rv - WAIT_OBJECT_0;
     if (rv == WAIT_FAILED) {
         /* Something serious is wrong */
-        ap_log_error(APLOG_MARK,APLOG_CRIT, GetLastError(), server_conf,
+        ap_log_error(APLOG_MARK,APLOG_CRIT, apr_get_os_error(), server_conf,
                      "master_main: WaitForMultipeObjects WAIT_FAILED -- doing server shutdown");
         shutdown_pending = 1;
     }
     else if (rv == WAIT_TIMEOUT) {
         /* Hey, this cannot happen */
-        ap_log_error(APLOG_MARK, APLOG_ERR, GetLastError(), s,
+        ap_log_error(APLOG_MARK, APLOG_ERR, apr_get_os_error(), s,
                      "master_main: WaitForMultipeObjects with INFINITE wait exited with WAIT_TIMEOUT");
         shutdown_pending = 1;
     }
@@ -1708,7 +1709,7 @@ static int master_main(server_rec *s, HANDLE shutdown_event, HANDLE restart_even
         ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO, APR_SUCCESS, s, 
                      "master_main: Shutdown event signaled -- doing server shutdown.");
         if (ResetEvent(shutdown_event) == 0) {
-            ap_log_error(APLOG_MARK, APLOG_ERR, GetLastError(), s,
+            ap_log_error(APLOG_MARK, APLOG_ERR, apr_get_os_error(), s,
                          "ResetEvent(shutdown_event)");
         }
 
@@ -1720,7 +1721,7 @@ static int master_main(server_rec *s, HANDLE shutdown_event, HANDLE restart_even
         ap_log_error(APLOG_MARK, APLOG_INFO, APR_SUCCESS, s, 
                      "master_main: Restart event signaled. Doing a graceful restart.");
         if (ResetEvent(restart_event) == 0) {
-            ap_log_error(APLOG_MARK, APLOG_ERR, GetLastError(), s,
+            ap_log_error(APLOG_MARK, APLOG_ERR, apr_get_os_error(), s,
                          "master_main: ResetEvent(restart_event) failed.");
         }
         /* Signal each child process to die 
@@ -1731,7 +1732,7 @@ static int master_main(server_rec *s, HANDLE shutdown_event, HANDLE restart_even
          */
         for (i = 0; i < children_to_kill; i++) {
             if (SetEvent(process_kill_events[i]) == 0)
-                ap_log_error(APLOG_MARK, APLOG_ERR, GetLastError(), s,
+                ap_log_error(APLOG_MARK, APLOG_ERR, apr_get_os_error(), s,
                              "master_main: SetEvent for child process in slot #%d failed", i);
             cleanup_process(process_handles, process_kill_events, i, &current_live_processes);
         }
@@ -1772,7 +1773,7 @@ die_now:
         for (i = 0; i < current_live_processes; i++) {
             printf("SetEvent handle = %d\n", process_kill_events[i]);
             if (SetEvent(process_kill_events[i]) == 0)
-                ap_log_error(APLOG_MARK,APLOG_ERR, GetLastError(), server_conf,
+                ap_log_error(APLOG_MARK,APLOG_ERR, apr_get_os_error(), server_conf,
                              "master_main: SetEvent for child process in slot #%d failed", i);
         }
 
@@ -1877,7 +1878,7 @@ void winnt_rewrite_args(process_rec *process)
         /* WARNING: There is an implict assumption here that the
          * executable resides in the ServerRoot!
          */
-        rv = GetLastError();
+        rv = apr_get_os_error();
         ap_log_error(APLOG_MARK,APLOG_ERR, rv, NULL, 
                      "Failed to get the running module's file name");
         exit(1);
@@ -2112,7 +2113,7 @@ static void winnt_post_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *p
                                                           0,
                                                           0); /* CONCURRENT ACTIVE THREADS */
                 if (AcceptExCompPort == NULL) {
-                    ap_log_error(APLOG_MARK,APLOG_ERR, GetLastError(), server_conf,
+                    ap_log_error(APLOG_MARK,APLOG_ERR, apr_get_os_error(), server_conf,
                                  "Parent: Unable to create the AcceptExCompletionPort -- process will exit");
                     exit(1);
                 }
@@ -2125,7 +2126,7 @@ static void winnt_post_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *p
              */
             shutdown_event = CreateEvent(sa, FALSE, FALSE, signal_shutdown_name);
             if (!shutdown_event) {
-                ap_log_error(APLOG_MARK, APLOG_EMERG, GetLastError(), server_conf,
+                ap_log_error(APLOG_MARK, APLOG_EMERG, apr_get_os_error(), server_conf,
                              "Parent: Cannot create shutdown event %s", signal_shutdown_name);
                 CleanNullACL((void *)sa);
                 exit(1);
@@ -2137,7 +2138,7 @@ static void winnt_post_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *p
             restart_event = CreateEvent(sa, FALSE, FALSE, signal_restart_name);
             if (!restart_event) {
                 CloseHandle(shutdown_event);
-                ap_log_error(APLOG_MARK, APLOG_EMERG, GetLastError(), server_conf,
+                ap_log_error(APLOG_MARK, APLOG_EMERG, apr_get_os_error(), server_conf,
                              "Parent: Cannot create restart event %s", signal_restart_name);
                 CleanNullACL((void *)sa);
                 exit(1);

diff --git a/server/mpm/winnt/registry.c b/server/mpm/winnt/registry.c
index 80d2d9bdb3e35d870b9795f7568a6fe51bd0bd6a..4b30b3ddb061605f25f410b5f808e04ed7fad21a 100644 (file)
--- a/server/mpm/winnt/registry.c
+++ b/server/mpm/winnt/registry.c
@@ -95,7 +95,8 @@
  * with SetLastError() before calling the aplog_error() function.
  * Because this is common, let's have a macro.
  */
-#define return_error(rv) return (SetLastError(rv), rv);
+#define return_error(rv) return (apr_set_os_error(APR_FROM_OS_ERROR(rv)),\
+                                 APR_FROM_OS_ERROR(rv));
 
 apr_status_t ap_registry_create_key(const char *key)
 {

diff --git a/server/mpm/winnt/service.c b/server/mpm/winnt/service.c
index b491b6e3c171ca10b8c922ad6f0311c29cf6cc22..6c40192a586370303023bb76f94b82f51f26c8aa 100644 (file)
--- a/server/mpm/winnt/service.c
+++ b/server/mpm/winnt/service.c
@@ -238,7 +238,7 @@ static DWORD WINAPI monitor_service_9x_thread(void *service_name)
 
     if (!RegisterClass(&wc)) 
     {
-        ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_STARTUP, GetLastError(), 
+        ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_STARTUP, apr_get_os_error(), 
                      NULL, "Could not register window class for WatchWindow");
         SetEvent(globdat.signal_monitor);
         globdat.service_thread_id = 0;
@@ -254,7 +254,7 @@ static DWORD WINAPI monitor_service_9x_thread(void *service_name)
                             
     if (!hwndMain)
     {
-        ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_STARTUP, GetLastError(), 
+        ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_STARTUP, apr_get_os_error(), 
                      NULL, "Could not create WatchWindow");
         SetEvent(globdat.signal_monitor);
         globdat.service_thread_id = 0;
@@ -535,7 +535,7 @@ static void __stdcall service_nt_main_fn(DWORD argc, LPTSTR *argv)
 
     if(!(globdat.hServiceStatus = RegisterServiceCtrlHandler(argv[0], service_nt_ctrl)))
     {
-        ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_STARTUP, GetLastError(), 
+        ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_STARTUP, apr_get_os_error(), 
                      NULL, "Failure registering service handler");
         PulseEvent(globdat.signal_monitor);
         return;
@@ -635,7 +635,7 @@ DWORD WINAPI service_nt_dispatch_thread(LPVOID nada)
     if (!StartServiceCtrlDispatcher(dispatchTable))
     {
         /* This is a genuine failure of the SCM. */
-        rv = GetLastError();
+        rv = apr_get_os_error();
         ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_STARTUP, rv, NULL,
                      "Error starting service control dispatcher");
     }
@@ -822,7 +822,7 @@ apr_status_t mpm_service_install(apr_pool_t *ptemp, int argc,
 
     if (GetModuleFileName(NULL, exe_path, sizeof(exe_path)) == 0)
     {
-        apr_status_t rv = GetLastError();
+        apr_status_t rv = apr_get_os_error();
         ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_STARTUP, rv, NULL,
                      "GetModuleFileName failed");
         return rv;
@@ -837,7 +837,7 @@ apr_status_t mpm_service_install(apr_pool_t *ptemp, int argc,
         schSCManager = OpenSCManager(NULL, NULL, /* local, default database */
                                      SC_MANAGER_ALL_ACCESS);
         if (!schSCManager) {
-            rv = GetLastError();
+            rv = apr_get_os_error();
             ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_STARTUP, rv, NULL,
                          "Failed to open the WinNT service manager");
             return (rv);
@@ -866,7 +866,7 @@ apr_status_t mpm_service_install(apr_pool_t *ptemp, int argc,
 
         if (!schService) 
         {
-            rv = GetLastError();
+            rv = apr_get_os_error();
             ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_STARTUP, rv, NULL, 
                          "Failed to create WinNT Service Profile");
             CloseServiceHandle(schSCManager);
@@ -929,7 +929,7 @@ apr_status_t mpm_service_uninstall(void)
         schSCManager = OpenSCManager(NULL, NULL, /* local, default database */
                                      SC_MANAGER_ALL_ACCESS);
         if (!schSCManager) {
-            rv = GetLastError();
+            rv = apr_get_os_error();
             ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_STARTUP, rv, NULL,
                          "Failed to open the WinNT service manager.");
             return (rv);
@@ -938,7 +938,7 @@ apr_status_t mpm_service_uninstall(void)
         schService = OpenService(schSCManager, service_name, SERVICE_ALL_ACCESS);
 
         if (!schService) {
-           rv = GetLastError();
+           rv = apr_get_os_error();
            ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_STARTUP, rv, NULL,
                        "%s: OpenService failed", display_name);
            return (rv);
@@ -955,7 +955,7 @@ apr_status_t mpm_service_uninstall(void)
         // ap_stop_service(schService);
 
         if (DeleteService(schService) == 0) {
-            rv = GetLastError();
+            rv = apr_get_os_error();
            ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_STARTUP, rv, NULL,
                          "%s: Failed to delete the service.", display_name);
             return (rv);
@@ -971,7 +971,7 @@ apr_status_t mpm_service_uninstall(void)
         /* TODO: assure the service is stopped before continuing */
 
         if (ap_registry_delete_value(SERVICECONFIG9X, service_name)) {
-            rv = GetLastError();
+            rv = apr_get_os_error();
            ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_STARTUP, rv, NULL,
                          "%s: Failed to remove the RunServices registry "
                          "entry.", display_name);
@@ -982,7 +982,7 @@ apr_status_t mpm_service_uninstall(void)
         apr_snprintf(key_name, sizeof(key_name), SERVICECONFIG, service_name);
         if (ap_registry_delete_key(key_name)) 
         {
-            rv = GetLastError();
+            rv = apr_get_os_error();
             ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_STARTUP, rv, NULL,
                          "%s: Failed to remove the service config from the "
                          "registry.", display_name);
@@ -1033,7 +1033,7 @@ apr_status_t mpm_service_start(apr_pool_t *ptemp, int argc,
         schSCManager = OpenSCManager(NULL, NULL, /* local, default database */
                                      SC_MANAGER_ALL_ACCESS);
         if (!schSCManager) {
-            rv = GetLastError();
+            rv = apr_get_os_error();
             ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_STARTUP, rv, NULL,
                          "Failed to open the WinNT service manager");
             return (rv);
@@ -1042,7 +1042,7 @@ apr_status_t mpm_service_start(apr_pool_t *ptemp, int argc,
         schService = OpenService(schSCManager, service_name, 
                                  SERVICE_START | SERVICE_QUERY_STATUS);
         if (!schService) {
-            rv = GetLastError();
+            rv = apr_get_os_error();
             ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_STARTUP, rv, NULL,
                          "%s: Failed to open the service.", display_name);
             CloseServiceHandle(schSCManager);
@@ -1072,7 +1072,7 @@ apr_status_t mpm_service_start(apr_pool_t *ptemp, int argc,
                 rv = APR_SUCCESS;
 
         if (rv != APR_SUCCESS)
-            rv = GetLastError();
+            rv = apr_get_os_error();
         
         CloseServiceHandle(schService);
         CloseServiceHandle(schSCManager);
@@ -1103,7 +1103,7 @@ apr_status_t mpm_service_start(apr_pool_t *ptemp, int argc,
         
         if (GetModuleFileName(NULL, exe_path, sizeof(exe_path)) == 0)
         {
-            apr_status_t rv = GetLastError();
+            apr_status_t rv = apr_get_os_error();
             ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_STARTUP, rv, NULL,
                          "GetModuleFileName failed");
             return rv;
@@ -1137,7 +1137,7 @@ apr_status_t mpm_service_start(apr_pool_t *ptemp, int argc,
         }
         
         if (rv != APR_SUCCESS)
-            rv = GetLastError();
+            rv = apr_get_os_error();
         
         CloseHandle(pi.hProcess);
         CloseHandle(pi.hThread);
@@ -1169,7 +1169,7 @@ void mpm_signal_service(apr_pool_t *ptemp, int signal)
                                      SC_MANAGER_ALL_ACCESS);
         
         if (!schSCManager) {
-            ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_STARTUP, GetLastError(), NULL,
+            ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_STARTUP, apr_get_os_error(), NULL,
                          "Failed to open the NT Service Manager");
             return;
         }
@@ -1179,14 +1179,14 @@ void mpm_signal_service(apr_pool_t *ptemp, int signal)
 
         if (schService == NULL) {
             /* Could not open the service */
-            ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_STARTUP, GetLastError(), NULL,
+            ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_STARTUP, apr_get_os_error(), NULL,
                          "Failed to open the %s Service", display_name);
             CloseServiceHandle(schSCManager);
             return;
         }
         
         if (!QueryServiceStatus(schService, &globdat.ssStatus)) {
-            ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_STARTUP, GetLastError(), NULL,
+            ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_STARTUP, apr_get_os_error(), NULL,
                          "Query of Service %s failed", display_name);
             CloseServiceHandle(schService);
             CloseServiceHandle(schSCManager);