fix(os): use HOSFILE_INVALID to denote an invalid file handle

This commit is contained in:
phaneron 2023-08-24 20:47:11 -04:00
parent 9c7aadb37e
commit 747cdf796f
2 changed files with 6 additions and 4 deletions

View file

@ -5,9 +5,9 @@
HOSFILE OsCreateFile(const char* fileName, uint32_t desiredAccess, uint32_t shareMode, uint32_t createDisposition, uint32_t flagsAndAttributes, uint32_t extendedFileType) { HOSFILE OsCreateFile(const char* fileName, uint32_t desiredAccess, uint32_t shareMode, uint32_t createDisposition, uint32_t flagsAndAttributes, uint32_t extendedFileType) {
// Ensure sanity // Ensure sanity
BLIZZARD_VALIDATE(fileName, "invalid filename", nullptr); BLIZZARD_VALIDATE(fileName, "invalid filename", HOSFILE_INVALID);
BLIZZARD_VALIDATE(desiredAccess != 0, "invalid desired access", nullptr); BLIZZARD_VALIDATE(desiredAccess != 0, "invalid desired access", HOSFILE_INVALID);
BLIZZARD_VALIDATE(createDisposition <= OS_TRUNCATE_EXISTING, "invalid create disposition", nullptr); BLIZZARD_VALIDATE(createDisposition <= OS_TRUNCATE_EXISTING, "invalid create disposition", HOSFILE_INVALID);
uint32_t flags = 0; uint32_t flags = 0;
@ -55,7 +55,7 @@ HOSFILE OsCreateFile(const char* fileName, uint32_t desiredAccess, uint32_t shar
Blizzard::File::StreamRecord* stream; Blizzard::File::StreamRecord* stream;
bool success = Blizzard::File::Open(fileName, flags, stream); bool success = Blizzard::File::Open(fileName, flags, stream);
if (!success) { if (!success) {
return nullptr; return HOSFILE_INVALID;
} }
// Set attributes // Set attributes

View file

@ -50,6 +50,8 @@ enum EOSFileFlagsAndAttributes {
typedef Blizzard::File::StreamRecord* HOSFILE; typedef Blizzard::File::StreamRecord* HOSFILE;
constexpr HOSFILE HOSFILE_INVALID = nullptr;
HOSFILE OsCreateFile(const char* fileName, uint32_t desiredAccess, uint32_t shareMode, uint32_t createDisposition, uint32_t flagsAndAttributes, uint32_t extendedFileType); HOSFILE OsCreateFile(const char* fileName, uint32_t desiredAccess, uint32_t shareMode, uint32_t createDisposition, uint32_t flagsAndAttributes, uint32_t extendedFileType);
int32_t OsSetFileAttributes(const char* fileName, uint32_t attributes); int32_t OsSetFileAttributes(const char* fileName, uint32_t attributes);