aboutsummaryrefslogtreecommitdiffstats
path: root/version_info.c
diff options
context:
space:
mode:
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2005-10-04 04:12:34 +0000
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2005-10-04 04:12:34 +0000
commitd8278dd95b2ea85bbc69f38641a2011c3789b64b (patch)
tree37d137684b405f144dfe462f767ce1d678187431 /version_info.c
parent05ae4a7e077272e61b0da0d0de2544d43862450b (diff)
Grr. Without the right version of the SDK, we can't even compile code
to *use* the shiny new features. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@16102 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'version_info.c')
-rw-r--r--version_info.c20
1 files changed, 8 insertions, 12 deletions
diff --git a/version_info.c b/version_info.c
index b80f43db5b..e53acc30b3 100644
--- a/version_info.c
+++ b/version_info.c
@@ -230,6 +230,12 @@ get_runtime_version_info(GString *str)
* of that is left as an exercise to the reader - who should
* check any copyright information about code samples on MSDN
* before cutting and pasting into Ethereal.
+ *
+ * They should also note that you need an OSVERSIONINFOEX structure
+ * to get some of that information, and that not only is that
+ * structure not supported on older versions of Windows, you might
+ * not even be able to compile code that *uses* that structure with
+ * older versions of the SDK.
*/
info.dwOSVersionInfoSize = sizeof info;
if (!GetVersionEx(&info)) {
@@ -303,14 +309,7 @@ get_runtime_version_info(GString *str)
break;
case 2:
- /*
- * The 64-bit version of XP is, I guess,
- * built on the NT 5.2 code base.
- */
- if (info.wProductType == VER_NT_WORKSTATION)
- g_string_sprintfa(str, "Windows XP");
- else
- g_string_sprintfa(str, "Windows Server 2003");
+ g_string_sprintfa(str, "Windows Server 2003");
break;
default:
@@ -321,10 +320,7 @@ get_runtime_version_info(GString *str)
break;
case 6:
- if (info.wProductType == VER_NT_WORKSTATION)
- g_string_sprintfa(str, "Windows Vista");
- else
- g_string_sprintfa(str, "Windows Server \"Longhorn\"");
+ g_string_sprintfa(str, "Windows Vista");
break;
default: