Added support for Windows code name "Longhorn".

diff --git a/src/dns_internal.cc b/src/dns_internal.cc
index 37d8377087dcb193cea8c3fc532185e2c4c45ad1..74be01008580781b45bad49c82c46d9f1e4bed04 100644 (file)
--- a/src/dns_internal.cc
+++ b/src/dns_internal.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: dns_internal.cc,v 1.78 2005/05/14 02:40:56 hno Exp $
+ * $Id: dns_internal.cc,v 1.79 2005/08/28 08:55:21 serassio Exp $
  *
  * DEBUG: section 78    DNS lookups; interacts with lib/rfc1035.c
  * AUTHOR: Duane Wessels
@@ -306,6 +306,8 @@ idnsParseWIN32Registry(void)
     case _WIN_OS_WINXP:
 
     case _WIN_OS_WINNET:
+
+    case _WIN_OS_WINLON:
         /* get nameservers from the Windows 2000 registry */
         /* search all interfaces for DNS server addresses */
 

diff --git a/src/enums.h b/src/enums.h
index bf4819e79477158f6f11ecf30ec9bf8c00ec06eb..3c2ff076f0051c3b45991396d7d2c6cda4f4c4ec 100644 (file)
--- a/src/enums.h
+++ b/src/enums.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: enums.h,v 1.242 2005/03/18 15:12:36 hno Exp $
+ * $Id: enums.h,v 1.243 2005/08/28 08:55:21 serassio Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -725,7 +725,8 @@ enum {
     _WIN_OS_WINNT,
     _WIN_OS_WIN2K,
     _WIN_OS_WINXP,
-    _WIN_OS_WINNET
+    _WIN_OS_WINNET,
+    _WIN_OS_WINLON
 };
 
 #endif

diff --git a/src/win32.cc b/src/win32.cc
index 38e5194973d2692aa2c54c5a4e96c43f72b2eff6..946eaf88c1b639d80f422b03793b00e4575ab163 100644 (file)
--- a/src/win32.cc
+++ b/src/win32.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: win32.cc,v 1.16 2005/08/28 08:37:30 serassio Exp $
+ * $Id: win32.cc,v 1.17 2005/08/28 08:55:21 serassio Exp $
  *
  * * * * * * * * Legal stuff * * * * * * *
  *
@@ -335,6 +335,11 @@ GetOSVersion()
             return _WIN_OS_WINNET;
         }
 
+        if ((osvi.dwMajorVersion == 6) && (osvi.dwMinorVersion == 0)) {
+            WIN32_OS_string = xstrdup("Windows code name \"Longhorn\"");
+            return _WIN_OS_WINLON;
+        }
+
         break;
 
     case VER_PLATFORM_WIN32_WINDOWS:
@@ -725,8 +730,7 @@ WIN32_InstallService()
                                    NULL);                                  /* no password            */
 
         if (schService) {
-            if ((WIN32_OS_version == _WIN_OS_WIN2K) || (WIN32_OS_version == _WIN_OS_WINXP)
-                    || (WIN32_OS_version == _WIN_OS_WINNET)) {
+            if (WIN32_OS_version > _WIN_OS_WINNT) {
                 HMODULE ADVAPI32Handle;
                 PFChangeServiceConfig2 ChangeServiceConfig2;
                 DWORD dwInfoLevel = SERVICE_CONFIG_DESCRIPTION;