Changeset 8777 for trunk/src/kernel32/oslibdos.cpp

Timestamp:

Jun 26, 2002, 9:42:35 AM (23 years ago)

Author:

sandervl

Message:

There are no bugs in the WGSS SystemTimeToFileTime & DosDateTimeToFileTime functions; Real problem lies in the fact that the times returned by DosFindFirst, DosFindNext, DosQueryPathInfo & DosQueryFileInfo are in local time; we must convert them to file time (UTC)

File:

• trunk/src/kernel32/oslibdos.cpp (modified) (3 diffs)

trunk/src/kernel32/oslibdos.cpp

@@ -1 @@
-/* $Id: oslibdos.cpp,v 1.104 2002-06-08 11:40:15 sandervl Exp $ */
+/* $Id: oslibdos.cpp,v 1.105 2002-06-26 07:42:34 sandervl Exp $ */
 /*
  * Wrappers for OS/2 Dos* API
@@ -860 +860 @@
 BOOL OSLibDosDelete(char *lpszFileName)
 {
- APIRET rc;
- char lOemFileName[260];
-
- CharToOemA(lpszFileName, lOemFileName);
-
-  rc = DosDelete(lOemFileName);
-  if(rc) {
-      SetLastError(error2WinError(rc));
-      return FALSE;
-  }
-  return TRUE;
+    APIRET rc;
+    char lOemFileName[260];
+
+    CharToOemA(lpszFileName, lOemFileName);
+
+    rc = DosDelete(lOemFileName);
+    if(rc) {
+        SetLastError(error2WinError(rc));
+        return FALSE;
+    }
+    return TRUE;
 }
 //******************************************************************************
@@ -876 +876 @@
 BOOL pmDateTimeToFileTime(FDATE *pDate,FTIME *pTime,FILETIME *pFT)
 {
-  register USHORT dosTime, dosDate;
-
-  dosTime = *(USHORT*)pTime;
-  dosDate = *(USHORT*)pDate;
-
-  // PH: probably replace with faster implementation than calling Open32
-  // through the external interface!
-  return DosDateTimeToFileTime(dosDate,dosTime,pFT);
+    USHORT   dosTime, dosDate;
+    BOOL     ret;
+    FILETIME dummy;
+
+    dosTime = *(USHORT*)pTime;
+    dosDate = *(USHORT*)pDate;
+
+    ret = DosDateTimeToFileTime(dosDate, dosTime, &dummy);
+    if(ret == FALSE) {
+        return FALSE;
+    }
+    //time we get from OS2 is local time; win32 expects file time (UTC)
+    ret = LocalFileTimeToFileTime(&dummy, pFT);
+    return ret;
 }
 //******************************************************************************