aaru-dps/fstester
1
0
Fork 0
mirror of https://github.com/aaru-dps/fstester.git synced 2025-12-16 19:24:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix how 32-bit vs 16-bit OS/2 is detected in attributes setter.

Browse Source
This commit is contained in:
Natalia Portillo
2021-04-11 00:41:08 +01:00
parent 49b5cd1701
commit d0ef9457f3
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
setter/src/os2/attr.c
View File

@@ -45,16 +45,12 @@ void FileAttributes(const char* path)
int i;
ACTION_RET actionTaken = 0;
// 32 bit
#if(defined(__I386__) || defined(__i386__) || defined(__THW_INTEL) || defined(_M_I386))
// 32 bit
#if(defined(__I386__) || defined(__i386__) || defined(__THW_INTEL) || defined(_M_I386) || defined(__386__))
FILESTATUS3 fileStatus = {{0}};
#endif
// 16 bit
#if(defined(__I86__) || defined(__i86__) || defined(_M_I86))
ULONG driveNo = path[0] - '@';
#else // 16 bit
USHORT driveNo = path[0] - '@';
#else // 32 bit
ULONG driveNo = path[0] - '@';
#endif
if(driveNo > 32) driveNo -= 32;
@@ -108,7 +104,7 @@ void FileAttributes(const char* path)
wRc = DosWrite(handle, (PVOID)os2_attrs[i].contents, strlen(os2_attrs[i].contents), &actionTaken);
// 32 bit
#if(defined(__I386__) || defined(__i386__) || defined(__THW_INTEL) || defined(_M_I386))
#if(defined(__I386__) || defined(__i386__) || defined(__THW_INTEL) || defined(_M_I386) || defined(__386__))
// It operates over the handle so file must be closed after setting attribute
fileStatus.attrFile = os2_attrs[i].attr;
rc = DosSetFileInfo(handle, FIL_STANDARD, &fileStatus, sizeof(FILESTATUS3));