Changeset 21302 for trunk/src/kernel32/time.cpp

Timestamp:

Jun 18, 2009, 11:53:26 AM (16 years ago)

Author:

ydario

Message:

Kernel32 updates.

File:

• trunk/src/kernel32/time.cpp (modified) (6 diffs)

trunk/src/kernel32/time.cpp

@@ -19 +19 @@
 #include <odinwrap.h>
 #include <os2sel.h>
+#include <FastInfoBlocks.h>
 
 #include <os2win.h>
@@ -93 +94 @@
 
     ret = O32_FileTimeToSystemTime(lpFileTime, lpSystemTime);
-    dprintf(("time: %d-%d-%d %d:%d:%d", lpSystemTime->wDay, lpSystemTime->wMonth, lpSystemTime->wYear, lpSystemTime->wHour, lpSystemTime->wMinute, lpSystemTime->wSecond));
+    dprintf(("time: %d-%d-%d %02d:%02d:%02d", lpSystemTime->wDay, lpSystemTime->wMonth, lpSystemTime->wYear, lpSystemTime->wHour, lpSystemTime->wMinute, lpSystemTime->wSecond));
     return ret;
 }
@@ -153 +154 @@
     }
     O32_GetSystemTime(lpSystemTime);
+    dprintf2(("time: %d-%d-%d %02d:%02d:%02d", lpSystemTime->wDay, lpSystemTime->wMonth, lpSystemTime->wYear, lpSystemTime->wHour, lpSystemTime->wMinute, lpSystemTime->wSecond));
 }
 //******************************************************************************
@@ -245 +247 @@
         RegCloseKey(hkey);
 
-        //TODO: we should return whether or we are in standard or daylight time
-        return TIME_ZONE_ID_STANDARD;
+        dprintf(("Bias         %x", lpTimeZone->Bias));
+        dprintf(("StandardName %ls", lpTimeZone->StandardName));
+        dprintf(("StandardBias %x", lpTimeZone->StandardBias));
+        dprintf(("StandardDate %d-%d-%d-%d", lpTimeZone->StandardDate.wYear, lpTimeZone->StandardDate.wMonth, lpTimeZone->StandardDate.wDay, lpTimeZone->StandardDate.wDayOfWeek));
+        dprintf(("DaylightName %ls", lpTimeZone->DaylightName));
+        dprintf(("DaylightBias %x", lpTimeZone->DaylightBias));
+        dprintf(("DaylightDate %d-%d-%d-%d\n", lpTimeZone->DaylightDate.wYear, lpTimeZone->DaylightDate.wMonth, lpTimeZone->DaylightDate.wDay, lpTimeZone->DaylightDate.wDayOfWeek));
+
+        //TODO: determine daylight or standard time
+        return TIME_ZONE_ID_UNKNOWN;
     }
     else
@@ -262 +272 @@
         lstrcpynAtoW(lpTimeZone->DaylightName, (LPSTR)tzone.DaylightName, len);
         lpTimeZone->DaylightName[len] = 0;
+
+        dprintf(("Bias         %x", lpTimeZone->Bias));
+        dprintf(("StandardName %ls", lpTimeZone->StandardName));
+        dprintf(("StandardBias %x", lpTimeZone->StandardBias));
+        dprintf(("StandardDate %d-%d-%d-%d", lpTimeZone->StandardDate.wYear, lpTimeZone->StandardDate.wMonth, lpTimeZone->StandardDate.wDay, lpTimeZone->StandardDate.wDayOfWeek));
+        dprintf(("DaylightName %ls", lpTimeZone->DaylightName));
+        dprintf(("DaylightBias %x", lpTimeZone->DaylightBias));
+        dprintf(("DaylightDate %d-%d-%d-%d\n", lpTimeZone->DaylightDate.wYear, lpTimeZone->DaylightDate.wMonth, lpTimeZone->DaylightDate.wDay, lpTimeZone->DaylightDate.wDayOfWeek));
         return ret;
     }
@@ -312 +330 @@
  * Author    : Patrick Haller [Mon, 1998/06/15 08:00]
  *****************************************************************************/
-
 VOID WIN32API GetSystemTimeAsFileTime(LPFILETIME lpSystemTimeAsFileTime)
 {
+    /*
+     *  Speculative time caching.
+     *      We assume GetSystemTime is using DosGetDateTime.
+     *      We assume DosGetDateTime uses the global info segment.
+     *      We assume that SIS_MsCount is updated when the rest of the date/time
+     *          members of the global info segment is updated.
+     *
+     *  Possible sideffects:
+     *    - The code doens't take in account changes of timezone, and hence will
+     *      be wrong until the next timer tick. This isn't a problem I think.
+     *    -
+     */
+    #if 1
+    static  FILETIME    LastFileTime;
+    static  ULONG       LastMsCount = -1;
+    if (fibGetMsCount() == LastMsCount) {
+        *lpSystemTimeAsFileTime = LastFileTime;
+    }
+    else
+    {
+        SYSTEMTIME      st;
+        ULONG           ulNewMsCount = fibGetMsCount();
+        GetSystemTime(&st);
+        SystemTimeToFileTime(&st, lpSystemTimeAsFileTime);
+        LastFileTime = *lpSystemTimeAsFileTime;
+        LastMsCount = ulNewMsCount;
+    }
+    dprintf2(("Time %08x%08x", lpSystemTimeAsFileTime->dwHighDateTime, lpSystemTimeAsFileTime->dwLowDateTime));
+    #else
     SYSTEMTIME st;
-
     GetSystemTime(&st);
     SystemTimeToFileTime(&st, lpSystemTimeAsFileTime);
-}
-//******************************************************************************
-//******************************************************************************
-
-
+    dprintf2(("Time %08x%08x", lpSystemTimeAsFileTime->dwHighDateTime, lpSystemTimeAsFileTime->dwLowDateTime));
+    #endif
+}
+//******************************************************************************
+//******************************************************************************
+
+