Windows port: Added support for Windows 7, Windows Server 2008 R2 and later

diff --git a/src/WinSvc.cc b/src/WinSvc.cc
old mode 100644 (file)
new mode 100755 (executable)
index aa7cc45..0643428
--- a/src/WinSvc.cc
+++ b/src/WinSvc.cc
@@ -347,6 +347,20 @@ GetOSVersion()
                 WIN32_OS_string = xstrdup("Windows Server 2008");
             return _WIN_OS_WINLON;
         }
+       if ((osvi.dwMajorVersion == 6) && (osvi.dwMinorVersion == 1)) {
+           if (osvi.wProductType == VER_NT_WORKSTATION)
+               WIN32_OS_string = xstrdup("Windows 7");
+           else
+               WIN32_OS_string = xstrdup("Windows Server 2008 R2");
+           return _WIN_OS_WIN7;
+       }
+       if (((osvi.dwMajorVersion > 6)) || ((osvi.dwMajorVersion == 6) && (osvi.dwMinorVersion > 1))) {
+           if (osvi.wProductType == VER_NT_WORKSTATION)
+               WIN32_OS_string = xstrdup("Unknown Windows version, assuming Windows 7 capabilities");
+           else
+               WIN32_OS_string = xstrdup("Unknown Windows version, assuming Windows Server 2008 R2 capabilities");
+           return _WIN_OS_WIN7;
+       }
         break;
     case VER_PLATFORM_WIN32_WINDOWS:
         if ((osvi.dwMajorVersion == 4) && (osvi.dwMinorVersion == 0)) {

diff --git a/src/dns_internal.cc b/src/dns_internal.cc
old mode 100644 (file)
new mode 100755 (executable)
index 02e8516..c58db66
--- a/src/dns_internal.cc
+++ b/src/dns_internal.cc
@@ -484,6 +484,8 @@ idnsParseWIN32Registry(void)
     case _WIN_OS_WINNET:
 
     case _WIN_OS_WINLON:
+
+    case _WIN_OS_WIN7:
         /* get nameservers from the Windows 2000 registry */
         /* search all interfaces for DNS server addresses */
 

diff --git a/src/enums.h b/src/enums.h
old mode 100644 (file)
new mode 100755 (executable)
index 1c7e290..e664928
--- a/src/enums.h
+++ b/src/enums.h
@@ -521,7 +521,8 @@ enum {
     _WIN_OS_WIN2K,
     _WIN_OS_WINXP,
     _WIN_OS_WINNET,
-    _WIN_OS_WINLON
+    _WIN_OS_WINLON,
+    _WIN_OS_WIN7
 };
 
 #endif