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

Timestamp:

Apr 30, 2002, 11:21:33 AM (23 years ago)

Author:

sandervl

Message:

PF: FileTimeToSystemTime, DosDateTimeToFileTime & SystemTimeToFileTime bugfixes

File:

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

trunk/src/kernel32/time.cpp

@@ -1 @@
-/* $Id: time.cpp,v 1.17 2002-02-09 17:27:32 sandervl Exp $ */
+/* $Id: time.cpp,v 1.18 2002-04-30 09:21:33 sandervl Exp $ */
 
 /*
@@ -31 +31 @@
 #include <string.h>
 #include <stdio.h>
+#include <time.h>
 #include "unicode.h"
 
@@ -104 +105 @@
     return O32_FileTimeToDosDateTime(arg1, arg2, arg3);
 }
-//******************************************************************************
-//******************************************************************************
-BOOL WIN32API FileTimeToLocalFileTime(const FILETIME * arg1, LPFILETIME arg2)
-{
-    dprintf(("KERNEL32:  FileTimeToLocalFileTime\n"));
-    return O32_FileTimeToLocalFileTime(arg1, arg2);
+
+//******************************************************************************
+//******************************************************************************
+BOOL WIN32API FileTimeToLocalFileTime(const FILETIME * utcft, LPFILETIME localft)
+{
+   return O32_FileTimeToLocalFileTime(utcft,localft); 
 }
 //******************************************************************************
@@ -122 +123 @@
 BOOL WIN32API FileTimeToSystemTime(const FILETIME * arg1, LPSYSTEMTIME arg2)
 {
-  return O32_FileTimeToSystemTime(arg1, arg2);
+   /* Another WGSS bug it expects not UCT on input but LocalTime! */
+   FILETIME dummy;
+   FileTimeToLocalFileTime(arg1,&dummy);
+   return O32_FileTimeToSystemTime(&dummy, arg2);
 }
 //******************************************************************************
@@ -128 +132 @@
 BOOL WIN32API DosDateTimeToFileTime(WORD arg1, WORD arg2, LPFILETIME arg3)
 {
-    return O32_DosDateTimeToFileTime(arg1, arg2, arg3);
+    BOOL rc; 
+    rc = O32_DosDateTimeToFileTime(arg1, arg2, arg3);
+    /* Bug in WGSS after that we must have UCT file time on return,
+       instead we have local! */
+    if (rc)
+    {
+      FILETIME dummy;
+      /* Convert it to UCT */ 
+      rc = LocalFileTimeToFileTime(arg3,&dummy);
+      memcpy(arg3,&dummy,sizeof(FILETIME));
+    }
+    return rc;
 }
 //******************************************************************************
@@ -154 +169 @@
                                    LPFILETIME arg2)
 {
-  return O32_SystemTimeToFileTime(arg1, arg2);
+    BOOL rc; 
+    rc = O32_SystemTimeToFileTime(arg1, arg2);
+    /* Bug in WGSS after that we must have UCT file time on return,
+       instead we have local! */
+    if (rc)
+    {
+      FILETIME dummy;
+      /* Convert it to local */ 
+      rc = LocalFileTimeToFileTime(arg2,&dummy);
+      memcpy(arg2,&dummy,sizeof(FILETIME));
+    }
+    return rc;
 }
 //******************************************************************************