Changeset 998 for trunk/src

Timestamp:

Sep 21, 1999, 1:01:43 PM (26 years ago)

Author:

phaller

Message:

Add: GetFileAttributeExA/W implemented. Time conversion is ugly still

Location:

trunk/src/kernel32

Files:

• Fileio.cpp (modified) (4 diffs)
• KERNEL32.DEF (modified) (2 diffs)
• oslibdos.cpp (modified) (2 diffs)
• oslibdos.h (modified) (2 diffs)

trunk/src/kernel32/Fileio.cpp

@@ -1 @@
-/* $Id: Fileio.cpp,v 1.8 1999-08-24 23:46:36 phaller Exp $ */
+/* $Id: Fileio.cpp,v 1.9 1999-09-21 11:00:23 phaller Exp $ */
 
 /*
@@ -20 +20 @@
 #include "handlemanager.h"
 #include "devio.h"
+#include "oslibdos.h"
 
 //******************************************************************************
@@ -786 +787 @@
 
 DWORD WIN32API GetCompressedFileSizeW(LPCWSTR  lpFileName,
-                                         LPDWORD  lpFileSizeHigh)
+                                      LPDWORD  lpFileSizeHigh)
 {
   LPCTSTR lpAsciiFileName;                             /* converted filename */
@@ -804 +805 @@
   return (rc);                                              /* return result */
 }
+
+
+/*****************************************************************************
+ * Name      : BOOL GetFileAttributesExA
+ * Purpose   :
+ * Parameters:
+ * Variables :
+ * Result    :
+ * Remark    : KERNEL32.874
+ * Status    : UNTESTED
+ *
+ * Author    : Patrick Haller [Mon, 1998/06/15 08:00]
+ *****************************************************************************/
+
+BOOL WIN32API GetFileAttributesExA(LPCSTR                 lpFileName,
+                                   GET_FILEEX_INFO_LEVELS fInfoLevelId,
+                                   LPVOID                 lpFileInformation)
+{
+  BOOL rc;
+
+  dprintf(("KERNEL32: GetFileAttributesExA(%s,%08xh,%08xh) mostly implemented.\n",
+           lpFileName,
+           fInfoLevelId,
+           lpFileInformation));
+
+  if (lpFileName == NULL) return FALSE;
+  if (lpFileInformation == NULL) return FALSE;
+
+  if (fInfoLevelId == GetFileExInfoStandard)
+  {
+    LPWIN32_FILE_ATTRIBUTE_DATA lpFad = (LPWIN32_FILE_ATTRIBUTE_DATA) lpFileInformation;
+
+    rc = OSLibDosGetFileAttributesEx((LPSTR)lpFileName,
+                                     fInfoLevelId,
+                                     lpFileInformation);
+    return (rc);
+  }
+  else
+  {
+    dprintf(("KERNEL32: GetFileAttributesExA - invalid info level %d!\n",
+             fInfoLevelId));
+    return FALSE;
+  }
+}
+
+
+/*****************************************************************************
+ * Name      : BOOL GetFileAttributesExW
+ * Purpose   :
+ * Parameters:
+ * Variables :
+ * Result    :
+ * Remark    : KERNEL32.875
+ * Status    : UNTESTED
+ *
+ * Author    : Patrick Haller [Mon, 1998/06/15 08:00]
+ *****************************************************************************/
+
+BOOL WINAPI GetFileAttributesExW(LPCWSTR                lpFileName,
+                                 GET_FILEEX_INFO_LEVELS fInfoLevelId,
+                                 LPVOID                 lpFileInformation)
+{
+  LPSTR nameA = HEAP_strdupWtoA( GetProcessHeap(), 0, lpFileName );
+  BOOL res = GetFileAttributesExA( nameA, fInfoLevelId, lpFileInformation);
+  HeapFree( GetProcessHeap(), 0, nameA );
+  return res;
+}
+

trunk/src/kernel32/KERNEL32.DEF

@@ -1 @@
-; $Id: KERNEL32.DEF,v 1.39 1999-09-18 15:59:29 sandervl Exp $
+; $Id: KERNEL32.DEF,v 1.40 1999-09-21 11:00:23 phaller Exp $
 
 ;Created by BLAST for IBM's compiler
@@ -933 +933 @@
     lstrncmpA                  = _lstrncmpA@12               @785
     lstrncmpW                  = _lstrncmpW@12               @786
-    lstrncmpiA                 = _lstrncmpiA@12              @887
-
-
+
+    GetFileAttributesExA       = _GetFileAttributesExA@12    @874
+    GetFileAttributesExW       = _GetFileAttributesExW@12    @875
+
+    lstrncmpiA                 = _lstrncmpiA@12              @887
 
 ; ----------------------------------------------------------------------------

trunk/src/kernel32/oslibdos.cpp

@@ -1 @@
-/* $Id: oslibdos.cpp,v 1.3 1999-08-27 16:51:00 sandervl Exp $ */
+/* $Id: oslibdos.cpp,v 1.4 1999-09-21 11:00:22 phaller Exp $ */
 
 /*
@@ -163 +163 @@
 //******************************************************************************
 //******************************************************************************
+//@@@PH Note: this routine is nothing but a QUICK'N'DIRTY HACK!
+//@@@PH       this function should be implemented accordingly to NTDLL's
+//            RtlSecondsSince1980ToTime
+//            RtlTimeToSecondsSince1980
+static void iFDATEFTIME2FILETIME(FDATE fdOS2, FTIME ftOS2, LPFILETIME pftWin32)
+{
+  float f;
+  #define facSECOND 2                // as encoded in OS/2
+  #define facMINUTE 60
+  #define facHOUR   3600
+  #define facDAY    86400
+  #define facMONTH  facDAY * 30      // cough, cough :)
+  #define facYEAR   facDAY * 365
+
+  /* pftWin32 is 100ns based from 01.01.1601 00:00:00 */
+  f =   (fdOS2.year  +  379) * facYEAR        // 1980 - 1601
+      + (fdOS2.month - 0   ) * facMONTH
+      + (fdOS2.day   - 1   ) * facDAY
+      + (ftOS2.hours       ) * facHOUR
+      + (ftOS2.minutes     ) * facMINUTE
+      + (ftOS2.twosecs     ) * facSECOND;
+
+  f *= 10000; // convert to 100ns base
+  pftWin32->dwHighDateTime = (f / (float)(0xffffffff) );
+  pftWin32->dwLowDateTime  = (f - (float)((float)pftWin32->dwHighDateTime *
+                                          (float)0xffffffff) );
+}
+
+BOOL OSLibDosGetFileAttributesEx(PSZ   pszName,
+                                 ULONG ulDummy,
+                                 PVOID pBuffer)
+{
+  APIRET      rc;                                         /* API return code */
+  FILESTATUS3 fs3;                             /* file information structure */
+  LPWIN32_FILE_ATTRIBUTE_DATA lpFad = (LPWIN32_FILE_ATTRIBUTE_DATA) pBuffer;
+
+  // Note: we only handle standard "GetFileExInfoStandard" requests
+  rc = DosQueryPathInfo(pszName,               /* query the file information */
+                        FIL_STANDARD,
+                        &fs3,
+                        sizeof(fs3));
+  if (rc != NO_ERROR)                                    /* check for errors */
+    return FALSE;                                   /* raise error condition */
+
+  // convert structure
+  lpFad->dwFileAttributes = fs3.attrFile; // directly interchangeable
+  iFDATEFTIME2FILETIME(fs3.fdateCreation,   fs3.ftimeCreation,   &lpFad->ftCreationTime);
+  iFDATEFTIME2FILETIME(fs3.fdateLastAccess, fs3.ftimeLastAccess, &lpFad->ftLastAccessTime);
+  iFDATEFTIME2FILETIME(fs3.fdateLastWrite,  fs3.ftimeLastWrite,  &lpFad->ftLastWriteTime);
+
+  /* @@@PH we might add Aurora support ...
+  lpFad->nFileSizeHigh    = info.nFileSizeHigh;
+  */
+  lpFad->nFileSizeHigh    = 0;
+  lpFad->nFileSizeLow     = fs3.cbFile;
+
+  return TRUE;
+}

trunk/src/kernel32/oslibdos.h

@@ -1 @@
-/* $Id: oslibdos.h,v 1.3 1999-08-27 16:51:00 sandervl Exp $ */
+/* $Id: oslibdos.h,v 1.4 1999-09-21 11:00:23 phaller Exp $ */
 
 /*
@@ -19 +19 @@
 DWORD OSLibDosQueryMem(LPVOID lpMemAddr, DWORD *lpRangeSize, DWORD *lpAttr);
 DWORD OSLibDosSetMem(LPVOID lpMemAddr, DWORD size, DWORD flags);
+
+BOOL OSLibDosGetFileAttributesEx(PSZ pszName, ULONG ulDummy, PVOID pBuffer);
 
 #define OSLIB_NOERROR                   0