Support for Windows .NET (5.2). By Guido.

diff --git a/src/dns_internal.cc b/src/dns_internal.cc
index d19adeafa9e210c3b010636c9c71ad5fcc5d9d62..749df669010a4bc8510507148c31771e3fc5ba15 100644 (file)
--- a/src/dns_internal.cc
+++ b/src/dns_internal.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: dns_internal.cc,v 1.46 2002/04/13 23:07:50 hno Exp $
+ * $Id: dns_internal.cc,v 1.47 2002/06/25 11:43:34 hno Exp $
  *
  * DEBUG: section 78    DNS lookups; interacts with lib/rfc1035.c
  * AUTHOR: Duane Wessels
@@ -228,6 +228,7 @@ idnsParseWIN32Registry(void)
        break;
     case _WIN_OS_WIN2K:
     case _WIN_OS_WINXP:
+    case _WIN_OS_WINNET:
        /* get nameservers from the Windows 2000 registry */
        /* search all interfaces for DNS server addresses */
        if (RegOpenKey(HKEY_LOCAL_MACHINE,

diff --git a/src/enums.h b/src/enums.h
index 83666b80c01b106f134322e4bce0731fd3363664..bd7421adc053402224694c40f72dbc4dd9e527fc 100644 (file)
--- a/src/enums.h
+++ b/src/enums.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: enums.h,v 1.209 2002/06/24 06:07:38 hno Exp $
+ * $Id: enums.h,v 1.210 2002/06/25 11:43:34 hno Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -744,7 +744,8 @@ enum {
     _WIN_OS_WINME,
     _WIN_OS_WINNT,
     _WIN_OS_WIN2K,
-    _WIN_OS_WINXP
+    _WIN_OS_WINXP,
+    _WIN_OS_WINNET
 };
 
 #endif

diff --git a/src/win32.cc b/src/win32.cc
index 4faa5ee5072d76e1b38bff6d67c6a1d27b15334e..d77cc45b5f96bdb18d6e5c12f185606a27242de9 100644 (file)
--- a/src/win32.cc
+++ b/src/win32.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: win32.cc,v 1.4 2001/11/17 11:09:25 hno Exp $
+ * $Id: win32.cc,v 1.5 2002/06/25 11:43:34 hno Exp $
  *
  * * * * * * * * Legal stuff * * * * * * *
  *
@@ -57,6 +57,10 @@ GetOSVersion()
            WIN32_OS_string = xstrdup("Windows XP");
            return _WIN_OS_WINXP;
        }
+       if ((osvi.dwMajorVersion == 5) && (osvi.dwMinorVersion == 2)) {
+           WIN32_OS_string = xstrdup("Windows .NET");
+           return _WIN_OS_WINNET;
+       }
        break;
     case VER_PLATFORM_WIN32_WINDOWS:
        if ((osvi.dwMajorVersion == 4) && (osvi.dwMinorVersion == 0)) {