From 314759a9536845efc191ba9d92ea6cec71036c97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= <ge@gse.nl>
Date: Mon, 12 Jan 2004 11:06:27 +0000
Subject: [PATCH] Display both cmd.exe version and OS version when running
 under ReactOS

svn path=/trunk/; revision=7579
---
 reactos/subsys/system/cmd/ver.c | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/reactos/subsys/system/cmd/ver.c b/reactos/subsys/system/cmd/ver.c
index 333f5672b9d..2f84d345712 100644
--- a/reactos/subsys/system/cmd/ver.c
+++ b/reactos/subsys/system/cmd/ver.c
@@ -34,9 +34,20 @@
 
 VOID ShortVersion (VOID)
 {
+	OSVERSIONINFO VersionInfo;
+
 	ConOutPuts (_T("\n"
-	               SHELLINFO "\n"
-	               SHELLVER "\n"));
+	               SHELLINFO));
+	VersionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+	if (GetVersionEx(&VersionInfo) && 0 == _tcsnicmp(VersionInfo.szCSDVersion, _T("ReactOS"), 7))
+	{
+		ConOutPrintf(_T("%s running on %s"), SHELLVER, VersionInfo.szCSDVersion);
+	}
+	else
+	{
+		ConOutPuts(SHELLVER);
+	}
+	ConOutPuts (_T("\n"));
 }
 
 
@@ -63,11 +74,8 @@ INT cmd_ver (LPTSTR cmd, LPTSTR param)
 		return 0;
 	}
 
-	ConOutPuts (_T("\n"
-	               SHELLINFO "\n"
-	               SHELLVER "\n"
-	               "\n"
-	               "Copyright (C) 1994-1998 Tim Norman and others."));
+	ShortVersion();
+	ConOutPuts (_T("Copyright (C) 1994-1998 Tim Norman and others."));
 	ConOutPuts (_T("Copyright (C) 1998-2001 Eric Kohl and others."));
 
 	/* Basic copyright notice */