Changeset 9095 for trunk/src

Timestamp:

Aug 22, 2002, 4:21:27 PM (23 years ago)

Author:

sandervl

Message:

Rewrote GetFileAttributesA & translate filename used from Windows to OS/2 codepage

Location:

trunk/src/kernel32

Files:

• Fileio.cpp (modified) (5 diffs)
• oslibdos.cpp (modified) (3 diffs)
• oslibdos.h (modified) (2 diffs)

trunk/src/kernel32/Fileio.cpp

@@ -1 @@
-/* $Id: Fileio.cpp,v 1.67 2002-08-16 09:56:30 sandervl Exp $ */
+/* $Id: Fileio.cpp,v 1.68 2002-08-22 14:21:26 sandervl Exp $ */
 
 /*
@@ -293 +293 @@
         else  
             filename = (char *)lpFileName;
-      
+ 
         return (HANDLE)OSLibDosFindFirst(filename, (WIN32_FIND_DATAA *)lpFindFileData);
 
@@ -390 +390 @@
                                     DWORD * count)
 {
+    dprintf(("FindFirstFileMultiA %s %x %x", lpFileName, lpFindFileData, count));
     return (HANDLE)OSLibDosFindFirstMulti(lpFileName,lpFindFileData,count);
 }
@@ -404 +405 @@
               DWORD *count)
 {
-  return OSLibDosFindNextMulti(hFindFile,lpFindFileData,count);
+    dprintf(("FindNextFileMultiA %x %x %x", hFindFile, lpFindFileData, count));
+    return OSLibDosFindNextMulti(hFindFile,lpFindFileData,count);
 }
 //******************************************************************************
@@ -810 +812 @@
     DWORD rc, error;
 
-    if((NULL!=lpszFileName) && strlen(lpszFileName)==2 && lpszFileName[1] == ':')
-    {
-        char szDrive[4];
-        szDrive[0] = lpszFileName[0];
-        szDrive[1] = lpszFileName[1];
-        szDrive[2] = '\\';
-        szDrive[3] = 0x00;
-        rc = O32_GetFileAttributes((LPSTR)szDrive);
-    }
-    else {
-        rc = O32_GetFileAttributes((LPSTR)lpszFileName);
-        if(rc == -1 && lpszFileName[strlen(lpszFileName)-1] != '\\') {
-            char *filename = (char *)alloca(strlen(lpszFileName)+2); //+2!!!!!!
-            strcpy(filename, lpszFileName);
-            strcat(filename, "\\");
-            rc = O32_GetFileAttributes((LPSTR)filename);
-        }
-    }
+    rc = OSLibGetFileAttributes((LPSTR)lpszFileName);
+
     //SvL: Open32 returns FILE_ATTRIBUTE_DIRECTORY|FILE_ATTRIBUTE_NORMAL for
     //     directories whereas NT 4 (SP6) only returns FILE_ATTRIBUTE_DIRECTORY

trunk/src/kernel32/oslibdos.cpp

@@ -1 @@
-/* $Id: oslibdos.cpp,v 1.107 2002-07-13 15:58:20 sandervl Exp $ */
+/* $Id: oslibdos.cpp,v 1.108 2002-08-22 14:21:26 sandervl Exp $ */
 /*
  * Wrappers for OS/2 Dos* API
@@ -2272 +2272 @@
 //******************************************************************************
 //******************************************************************************
-BOOL  OSLibDosFindClose(DWORD hFindFile)
+BOOL OSLibDosFindClose(DWORD hFindFile)
 {
   APIRET rc = DosFindClose((HDIR)hFindFile);
@@ -2283 +2283 @@
   SetLastError(ERROR_SUCCESS_W);
   return TRUE;
+}
+//******************************************************************************
+//******************************************************************************
+DWORD OSLibGetFileAttributes(LPSTR lpFileName)
+{
+   FILESTATUS3 statusBuf;
+   char        lOemFileName[CCHMAXPATH];
+   char       *lpszBackslash, *lpszColon;
+   APIRET      rc;
+
+   //Convert file name from Windows to OS/2 codepage
+   CharToOemA(lpFileName, lOemFileName);
+   lpszBackslash = CharPrevA(lOemFileName, lOemFileName + strlen(lOemFileName));
+   if(lpszBackslash)
+   {
+       if(*lpszBackslash == '\\')
+       {
+           lpszColon = CharPrevA(lOemFileName, lpszBackslash);
+           if(lpszColon && *lpszColon != ':') 
+           {//only rootdir is allowed to have terminating backslash
+               *lpszBackslash = 0;
+           }
+       }
+       else
+       if(*lpszBackslash == ':')
+       {//root dir must end with backslash
+           strcat(lOemFileName, "\\");
+       }
+   }
+
+   rc = DosQueryPathInfo(lOemFileName, FIL_STANDARD, &statusBuf, sizeof(statusBuf));
+   if(rc == ERROR_TOO_MANY_OPEN_FILES)
+   {
+       LONG  reqCount = 2;
+       ULONG maxFiles;
+
+       if(DosSetRelMaxFH(&reqCount, &maxFiles) == NO_ERROR)
+           rc = DosQueryPathInfo(lOemFileName, FIL_STANDARD, &statusBuf, sizeof(statusBuf));
+   }
+
+   if(rc == NO_ERROR)
+   {
+      DWORD status = 0;
+      if(!(statusBuf.attrFile & NOT_NORMAL))
+          status |= FILE_ATTRIBUTE_NORMAL_W;
+      if(statusBuf.attrFile & FILE_READONLY)
+          status |= FILE_ATTRIBUTE_READONLY_W;
+      if(statusBuf.attrFile & FILE_HIDDEN)
+          status |= FILE_ATTRIBUTE_HIDDEN_W;
+      if(statusBuf.attrFile & FILE_SYSTEM)
+          status |= FILE_ATTRIBUTE_SYSTEM_W;
+      if(statusBuf.attrFile & FILE_DIRECTORY)
+          status |= FILE_ATTRIBUTE_DIRECTORY_W;
+      if(statusBuf.attrFile & FILE_ARCHIVED)
+          status |= FILE_ATTRIBUTE_ARCHIVE_W;
+
+      SetLastError(ERROR_SUCCESS_W);
+      return status;
+   }
+   SetLastError(error2WinError(rc));
+   return -1;
 }
 //******************************************************************************

trunk/src/kernel32/oslibdos.h

@@ -1 @@
-/* $Id: oslibdos.h,v 1.47 2002-07-15 14:28:52 sandervl Exp $ */
+/* $Id: oslibdos.h,v 1.48 2002-08-22 14:21:27 sandervl Exp $ */
 
 /*
@@ -173 +173 @@
 BOOL  OSLibDosFindNextMulti(DWORD hFindFile,WIN32_FIND_DATAA *lpFindFileData,DWORD *count);
 BOOL  OSLibDosFindClose(DWORD hFindFile);
+
+DWORD OSLibGetFileAttributes(LPSTR lpFileName);
 
 DWORD OSLibDosQueryVolumeFS(int drive, LPSTR lpFileSystemNameBuffer, DWORD nFileSystemNameSize);