From 58f5ef812eaf0a88dce4a852ec14e7dd8bd71d2e Mon Sep 17 00:00:00 2001
From: Magnus Olsen <magnus@greatlord.com>
Date: Thu, 21 Jul 2005 16:28:20 +0000
Subject: [PATCH] fix a small bug, write out time like HH:MM:SS,ms as ms cmd
 does.

svn path=/trunk/; revision=16681
---
 reactos/subsys/system/cmd/cmd.c    |  7 +++++--
 reactos/subsys/system/cmd/locale.c | 14 +++++++-------
 reactos/subsys/system/cmd/prompt.c |  9 +++++----
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/reactos/subsys/system/cmd/cmd.c b/reactos/subsys/system/cmd/cmd.c
index da5521a23f8..134bdf7068b 100644
--- a/reactos/subsys/system/cmd/cmd.c
+++ b/reactos/subsys/system/cmd/cmd.c
@@ -1035,8 +1035,11 @@ ProcessInput (BOOL bFlag)
               /* %TIME% */
               else if (_tcsicmp(ip,_T("time")) ==0)
               {
-                TCHAR szTime[40];                                                               
-                GetTimeFormat(LOCALE_USER_DEFAULT, 0, NULL, NULL, szTime, sizeof(szTime));              
+                TCHAR szTime[40];                                                                               
+                SYSTEMTIME t;
+                GetSystemTime(&t); 
+
+                _sntprintf(szTime ,40,_T("%02d%c%02d%c%02d%c%02d"), t.wHour, cTimeSeparator,t.wMinute , cTimeSeparator,t.wSecond , cDecimalSeparator, t.wMilliseconds );
                 cp = _stpcpy (cp, szTime);                 	              
               }
               
diff --git a/reactos/subsys/system/cmd/locale.c b/reactos/subsys/system/cmd/locale.c
index 6b13f457008..1f49e8401a5 100644
--- a/reactos/subsys/system/cmd/locale.c
+++ b/reactos/subsys/system/cmd/locale.c
@@ -70,12 +70,12 @@ VOID PrintDate (VOID)
 
 VOID PrintTime (VOID)
 {
-	TCHAR szMsg[RC_STRING_MAX_SIZE];
-	TCHAR szTime[32];
-
-	GetTimeFormat(LOCALE_USER_DEFAULT, 0, NULL, NULL,
-	              szTime, sizeof(szTime));
-
+	TCHAR szMsg[RC_STRING_MAX_SIZE];	
+  SYSTEMTIME t;
+  GetSystemTime(&t); 
+  
 	LoadString(CMD_ModuleHandle, STRING_LOCALE_HELP1, szMsg, RC_STRING_MAX_SIZE);
-	ConOutPrintf(_T("%s: %s\n"), szMsg, szTime);
+	ConOutPrintf(_T("%s: %02d%c%02d%c%02d%c%02d\n"), szMsg,  t.wHour, cTimeSeparator,
+		             t.wMinute , cTimeSeparator,
+		             t.wSecond , cDecimalSeparator, t.wMilliseconds );
 }
diff --git a/reactos/subsys/system/cmd/prompt.c b/reactos/subsys/system/cmd/prompt.c
index 94147549061..c5887e804ca 100644
--- a/reactos/subsys/system/cmd/prompt.c
+++ b/reactos/subsys/system/cmd/prompt.c
@@ -138,10 +138,11 @@ VOID PrintPrompt(VOID)
 					break;
 
 				case _T('T'):					
-          {
-          TCHAR szTime[32];          
-	        GetTimeFormat(LOCALE_USER_DEFAULT, 0, NULL, NULL,szTime, sizeof(szTime));
-          ConOutPrintf("%s",szTime);
+          {          
+          SYSTEMTIME t;
+          GetSystemTime(&t); 
+          ConOutPrintf(_T("%02d%c%02d%c%02d%c%02d\n"),t.wHour, cTimeSeparator,t.wMinute , cTimeSeparator,
+		      t.wSecond , cDecimalSeparator, t.wMilliseconds );
           }
 					break;