Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 39563 invoked from network); 8 May 2007 04:46:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 8 May 2007 04:46:17 -0000 Received: (qmail 98851 invoked by uid 500); 8 May 2007 04:46:23 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 98825 invoked by uid 500); 8 May 2007 04:46:22 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 98812 invoked by uid 99); 8 May 2007 04:46:22 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 May 2007 21:46:22 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 May 2007 21:46:15 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id B72781A9838; Mon, 7 May 2007 21:45:55 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r536052 - /httpd/httpd/trunk/support/win32/ApacheMonitor.c Date: Tue, 08 May 2007 04:45:55 -0000 To: cvs@httpd.apache.org From: mturk@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070508044555.B72781A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mturk Date: Mon May 7 21:45:54 2007 New Revision: 536052 URL: http://svn.apache.org/viewvc?view=rev&rev=536052 Log: Add detection for post XP operating systems. Think this can be safely backported to 2.2 and 2.0 branches Modified: httpd/httpd/trunk/support/win32/ApacheMonitor.c Modified: httpd/httpd/trunk/support/win32/ApacheMonitor.c URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/support/win32/ApacheMonitor.c?view=diff&rev=536052&r1=536051&r2=536052 ============================================================================== --- httpd/httpd/trunk/support/win32/ApacheMonitor.c (original) +++ httpd/httpd/trunk/support/win32/ApacheMonitor.c Mon May 7 21:45:54 2007 @@ -49,6 +49,8 @@ #define OS_VERSION_WIN9X 1 #define OS_VERSION_WINNT 2 #define OS_VERSION_WIN2K 3 +#define OS_VERSION_WINXP 4 +#define OS_VERSION_VISTA 5 /* Should be enough */ #define MAX_APACHE_SERVICES 128 #define MAX_APACHE_COMPUTERS 32 @@ -282,7 +284,13 @@ *dwVersion = OS_VERSION_WINNT; } else if (osvi.dwMajorVersion == 5) { - *dwVersion = OS_VERSION_WIN2K; + if (osvi.dwMinorVersion == 1) + *dwVersion = OS_VERSION_WINXP; + else + *dwVersion = OS_VERSION_WIN2K; + } + else if (osvi.dwMajorVersion == 6) { + *dwVersion = OS_VERSION_VISTA; } else { return FALSE;