diff options
Diffstat (limited to 'src/os')
| -rw-r--r-- | src/os/win32/ngx_errno.c | 2 | ||||
| -rw-r--r-- | src/os/win32/ngx_win32_init.c | 22 |
2 files changed, 19 insertions, 5 deletions
diff --git a/src/os/win32/ngx_errno.c b/src/os/win32/ngx_errno.c index 30c1b9315..3a9487c06 100644 --- a/src/os/win32/ngx_errno.c +++ b/src/os/win32/ngx_errno.c @@ -34,7 +34,7 @@ int ngx_strerror_r(ngx_err_t err, char *errstr, size_t size) ngx_err_t format_error; len = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM - | FORMAT_MESSAGE_IGNORE_INSERTS, + |FORMAT_MESSAGE_IGNORE_INSERTS, NULL, err, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), errstr, size, NULL); diff --git a/src/os/win32/ngx_win32_init.c b/src/os/win32/ngx_win32_init.c index 6bc69e4c9..c522c9e95 100644 --- a/src/os/win32/ngx_win32_init.c +++ b/src/os/win32/ngx_win32_init.c @@ -77,20 +77,34 @@ int ngx_os_init(ngx_log_t *log) + osvi.wServicePackMinor; ngx_log_error(NGX_LOG_INFO, log, 0, - "OS: %u build:%u, %s, suite:%x, type:%u", + "OS: %u build:%u, \"%s\", suite:%x, type:%u", ngx_win32_version, osvi.dwBuildNumber, osvi.szCSDVersion, osvi.wReserved[0], osvi.wReserved[1]); #if 0 ngx_log_error(NGX_LOG_INFO, log, 0, - "OS: %u build:%u, %s, suite:%x, type:%u", + "OS: %u build:%u, \"%s\", suite:%x, type:%u", ngx_win32_version, osvi.dwBuildNumber, osvi.szCSDVersion, osvi.wSuiteMask, osvi.wProductType); #endif } else { - ngx_log_error(NGX_LOG_INFO, log, 0, "OS: %u build:%u, %s", - ngx_win32_version, osvi.dwBuildNumber, osvi.szCSDVersion); + if (osvi.dwPlatformId == 1) { + + /* Win9x build */ + + ngx_log_error(NGX_LOG_INFO, log, 0, "OS: %u build:%u.%u.%u, \"%s\"", + ngx_win32_version, + osvi.dwBuildNumber >> 24, + (osvi.dwBuildNumber >> 16) & 0xff, + osvi.dwBuildNumber & 0xffff, + osvi.szCSDVersion); + + } else { + ngx_log_error(NGX_LOG_INFO, log, 0, "OS: %u build:%u, \"%s\"", + ngx_win32_version, osvi.dwBuildNumber, + osvi.szCSDVersion); + } } |