You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by mt...@apache.org on 2009/09/05 09:08:13 UTC
svn commit: r811593 - in /commons/sandbox/runtime/trunk/src/main/native:
include/arch/windows/acr_arch_private.h os/win32/os.c
Author: mturk
Date: Sat Sep 5 07:08:13 2009
New Revision: 811593
URL: http://svn.apache.org/viewvc?rev=811593&view=rev
Log:
Update version display. Windows 7 server is 2008R2. What a mess
Modified:
commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch_private.h
commons/sandbox/runtime/trunk/src/main/native/os/win32/os.c
Modified: commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch_private.h
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch_private.h?rev=811593&r1=811592&r2=811593&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch_private.h (original)
+++ commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch_private.h Sat Sep 5 07:08:13 2009
@@ -41,6 +41,10 @@
#define HAVE_FILEEXTD_LIB 0
#endif
+#if !defined (VER_SUITE_WH_SERVER)
+#define VER_SUITE_WH_SERVER 0x00008000
+#endif
+
#if HAVE_KTMW32_H
#include <ktmw32.h>
#endif
Modified: commons/sandbox/runtime/trunk/src/main/native/os/win32/os.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/os.c?rev=811593&r1=811592&r2=811593&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/win32/os.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/win32/os.c Sat Sep 5 07:08:13 2009
@@ -64,9 +64,13 @@
if (acr_osver->wProductType == VER_NT_WORKSTATION)
strcpy(buf, "XP");
else {
- strcpy(buf, "2003");
- if (GetSystemMetrics(SM_SERVERR2))
- strcat(buf, "R2");
+ if (acr_osver->wSuiteMask == VER_SUITE_WH_SERVER)
+ strcpy(buf, "Home");
+ else {
+ strcpy(buf, "2003");
+ if (GetSystemMetrics(SM_SERVERR2))
+ strcat(buf, "R2");
+ }
}
break;
}
@@ -89,7 +93,7 @@
strcpy(buf, "7");
break;
default:
- strcpy(buf, "7");
+ strcpy(buf, "2008R2");
break;
}
break;