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

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

File:

• trunk/src/kernel32/Fileio.cpp (modified) (5 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