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

Timestamp:

Dec 14, 2010, 6:56:52 PM (15 years ago)

Author:

dmik

Message:

kernel32: Fixed: GetFileInformation() would fail with ERROR_ACCESS_DEINIED on a file opened in write-only mode if it is located on an HPFS386 volume (HPFS386 treats EAs as part of file data, not part of file attributes).

File:

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

trunk/src/kernel32/oslibdos.cpp

@@ -34 +34 @@
 #include <win32api.h>
 #include <winconst.h>
-#include <win\winioctl.h>
+#include <win/winioctl.h>
 #include <misc.h>
 #include <odincrt.h>
@@ -1397 +1397 @@
  APIRET       rc;
 
+   // NOTE: On HPFS386, doing FIL_QUERYEASIZE on a write-only file will
+   // fail with ERROR_ACCESS_DENIED. Since we don't actually care about EAs
+   // here, we will simply use FIL_STANDARD instead.
+
    if(f64BitIO)
    {
-        FILESTATUS4L statusL = { 0 };
-
-        rc = DosQueryFileInfo(hFile, FIL_QUERYEASIZEL,
+        FILESTATUS3L statusL = { 0 };
+
+        rc = DosQueryFileInfo(hFile, FIL_STANDARDL,
                               &statusL, sizeof(statusL));
         if(rc == NO_ERROR)
@@ -1439 +1443 @@
    else
    {
-        FILESTATUS4  status  = { 0 };
-
-        rc = DosQueryFileInfo(hFile, FIL_QUERYEASIZE, &status,
+        FILESTATUS3  status  = { 0 };
+
+        rc = DosQueryFileInfo(hFile, FIL_STANDARD, &status,
                               sizeof(status));
         if(rc == NO_ERROR)