Changeset 3588 for trunk/src/kernel32/Fileio.cpp

Timestamp:

May 22, 2000, 9:08:01 PM (25 years ago)

Author:

sandervl

Message:

GetFileTime bugfix + FindResource(Ex)A/W changes + setup thread security objects during creation

File:

• trunk/src/kernel32/Fileio.cpp (modified) (4 diffs)

trunk/src/kernel32/Fileio.cpp

@@ -1 @@
-/* $Id: Fileio.cpp,v 1.32 2000-05-09 19:27:44 sandervl Exp $ */
+/* $Id: Fileio.cpp,v 1.33 2000-05-22 19:07:53 sandervl Exp $ */
 
 /*
@@ -241 +241 @@
 //******************************************************************************
 //******************************************************************************
+ODINFUNCTION4(BOOL, GetFileTime, HANDLE, hFile, LPFILETIME, arg2, LPFILETIME, arg3, LPFILETIME, arg4)
+{
+    return HMGetFileTime(hFile, arg2, arg3, arg4);
+}
+//******************************************************************************
+//******************************************************************************
 ODINFUNCTION3(BOOL, CopyFileA,
               LPCSTR, arg1,
@@ -280 +286 @@
               LPCSTR, lpszFile)
 {
-  dprintf(("DeleteFileA %s", lpszFile));
-  return O32_DeleteFile(lpszFile);
-//  return TRUE;
+ BOOL rc;
+
+  rc = O32_DeleteFile(lpszFile);
+  if(!rc) {
+        dprintf(("DeleteFileA %s returned FALSE; last error %x", lpszFile, GetLastError()));
+        if(GetLastError() == 20) {
+                return TRUE;
+        }
+  } 
+  else  dprintf(("DeleteFileA %s", lpszFile));
+
+  return rc;
 }
 //******************************************************************************
@@ -431 +446 @@
         }
     }
+    //SvL: Open32 returns FILE_ATTRIBUTE_DIRECTORY|FILE_ATTRIBUTE_NORMAL for
+    //     directories whereas NT 4 (SP6) only returns FILE_ATTRIBUTE_DIRECTORY
+    if(rc != -1 && (rc & FILE_ATTRIBUTE_DIRECTORY)) {
+        rc = FILE_ATTRIBUTE_DIRECTORY;
+    }
 
 #if 0 // need more tests, maybe there is also a better way to hide simulated b: