Return-Path: Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: (qmail 4097 invoked from network); 29 Aug 2009 08:06:29 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 29 Aug 2009 08:06:29 -0000 Received: (qmail 12638 invoked by uid 500); 29 Aug 2009 08:06:29 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 12541 invoked by uid 500); 29 Aug 2009 08:06:29 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 12529 invoked by uid 99); 29 Aug 2009 08:06:29 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 29 Aug 2009 08:06:29 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 29 Aug 2009 08:06:27 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2794F23888E9; Sat, 29 Aug 2009 08:06:07 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r809094 - /commons/sandbox/runtime/trunk/src/main/native/os/win32/time.c Date: Sat, 29 Aug 2009 08:06:07 -0000 To: commits@commons.apache.org From: mturk@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090829080607.2794F23888E9@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mturk Date: Sat Aug 29 08:06:06 2009 New Revision: 809094 URL: http://svn.apache.org/viewvc?rev=809094&view=rev Log: Use os provided dos time conbersion. TBR Modified: commons/sandbox/runtime/trunk/src/main/native/os/win32/time.c Modified: commons/sandbox/runtime/trunk/src/main/native/os/win32/time.c URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/time.c?rev=809094&r1=809093&r2=809094&view=diff ============================================================================== --- commons/sandbox/runtime/trunk/src/main/native/os/win32/time.c (original) +++ commons/sandbox/runtime/trunk/src/main/native/os/win32/time.c Sat Aug 29 08:06:06 2009 @@ -88,6 +88,7 @@ return aprtime; } +#if 0 ACR_DECLARE(acr_time_t) ACR_Dos2AcrTime(acr_uint32_t t) { struct tm tm; @@ -102,7 +103,24 @@ return tm2time(&tm); } +#else +ACR_DECLARE(acr_time_t) ACR_Dos2AcrTime(acr_uint32_t t) +{ + FILETIME ft; + WORD dd = (WORD)(t >> 16); + WORD dt = (WORD)(t & 0xFFFF); + if (DosDateTimeToFileTime(dd, dt, &ft)) { + LONGLONG aprtime; + FileTimeToUsecTime(&aprtime, &ft); + return aprtime; + } + else + return 0; +} +#endif + +#if 0 ACR_DECLARE(acr_uint32_t) ACR_Acr2DosTime(acr_time_t t) { FILETIME ft; @@ -124,3 +142,17 @@ ((tm.tm_sec / 2) + (32 * tm.tm_min) + (2048 * tm.tm_hour)); return rv; } +#else +ACR_DECLARE(acr_uint32_t) ACR_Acr2DosTime(acr_time_t t) +{ + FILETIME ft; + WORD dd; + WORD dt; + + UsecTimeToFileTime(&ft, t); + if (FileTimeToDosDateTime(&ft, &dd, &dt)) + return ((acr_uint32_t)dd << 16) | (acr_uint32_t)dt; + else + return 0; +} +#endif \ No newline at end of file