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

Timestamp:

Mar 29, 2000, 5:17:29 PM (25 years ago)

Author:

cbratschi

Message:

FindFirst* changes

File:

• trunk/src/kernel32/Fileio.cpp (modified) (6 diffs)

trunk/src/kernel32/Fileio.cpp

@@ -1 @@
-/* $Id: Fileio.cpp,v 1.26 2000-03-28 17:11:48 sandervl Exp $ */
+/* $Id: Fileio.cpp,v 1.27 2000-03-29 15:17:27 cbratschi Exp $ */
 
 /*
@@ -29 +29 @@
 #include "oslibdos.h"
 
-#define DBG_LOCALLOG    DBG_fileio
+#define DBG_LOCALLOG    DBG_fileio
 #include "dbglocal.h"
 
@@ -77 +77 @@
 //******************************************************************************
 ODINFUNCTION2(HANDLE, FindFirstFileA,
-              LPCSTR, arg1,
-              WIN32_FIND_DATAA *, arg2)
-{
-  dprintf(("FindFirstFileA %s", arg1));
-  return O32_FindFirstFile(arg1, arg2);
-}
-
+              LPCSTR, lpFileName,
+              WIN32_FIND_DATAA *, lpFindFileData)
+{
+  return (HANDLE)OSLibDosFindFirst(lpFileName,lpFindFileData);
+}
+//******************************************************************************
+// internal function for faster access (SHELL32)
+//******************************************************************************
+ODINFUNCTION3(HANDLE, FindFirstFileMultiA,
+              LPCSTR, lpFileName,
+              WIN32_FIND_DATAA *, lpFindFileData,
+              DWORD *,count)
+{
+  return (HANDLE)OSLibDosFindFirstMulti(lpFileName,lpFindFileData,count);
+}
 //******************************************************************************
 //******************************************************************************
 ODINFUNCTION2(HANDLE,  FindFirstFileW,
-              LPCWSTR, arg1,
-              WIN32_FIND_DATAW *, arg2)
+              LPCWSTR, lpFileName,
+              WIN32_FIND_DATAW *, lpFindFileData)
 {
   HANDLE           rc;
@@ -94 +102 @@
   WIN32_FIND_DATAA wfda;
 
-  astring = UnicodeToAsciiString((LPWSTR)arg1);
-  rc = FindFirstFileA(astring, &wfda);
+  astring = UnicodeToAsciiString((LPWSTR)lpFileName);
+  rc = (HANDLE)OSLibDosFindFirst(astring,&wfda);
 
   if(rc == -1) {
-        memset(arg2, 0, sizeof(WIN32_FIND_DATAW));
-  }
-  else {
-        // convert back the result structure
-        memcpy(arg2,
-                 &wfda,
-                 sizeof(WIN32_FIND_DATAA));
-        
-        lstrcpynAtoW (arg2->cFileName,
-                      wfda.cFileName,
-                      sizeof(wfda.cFileName));
-        
-        lstrcpynAtoW (arg2->cAlternateFileName,
-                      wfda.cAlternateFileName,
-                      sizeof(wfda.cAlternateFileName));
-  }     
-  FreeAsciiString(astring);
-  return(rc);
-}
-//******************************************************************************
-//******************************************************************************
-ODINFUNCTION2(BOOL,   FindNextFileA,
-              HANDLE, arg1,
-              WIN32_FIND_DATAA *, arg2)
-{
-  return O32_FindNextFile(arg1, arg2);
-}
-//******************************************************************************
-//******************************************************************************
-ODINFUNCTION2(BOOL, FindNextFileW,
-              HANDLE, arg1,
-              WIN32_FIND_DATAW *, arg2)
-{
-  WIN32_FIND_DATAA wfda;
-  BOOL             rc;
-
-  rc = FindNextFileA(arg1, &wfda);
-
-  if(rc == 0) {
-        memset(arg2, 0, sizeof(WIN32_FIND_DATAW));
+        memset(lpFindFileData, 0, sizeof(WIN32_FIND_DATAW));
   }
   else {
         // convert back the result structure
-        memcpy(arg2,
+        memcpy(lpFindFileData,
+                 &wfda,
+                 sizeof(WIN32_FIND_DATAA));
+
+        lstrcpynAtoW (lpFindFileData->cFileName,
+                      wfda.cFileName,
+                      sizeof(wfda.cFileName));
+
+        lstrcpynAtoW (lpFindFileData->cAlternateFileName,
+                      wfda.cAlternateFileName,
+                      sizeof(wfda.cAlternateFileName));
+  }
+  FreeAsciiString(astring);
+  return(rc);
+}
+//******************************************************************************
+//******************************************************************************
+ODINFUNCTION2(BOOL,   FindNextFileA,
+              HANDLE, hFindFile,
+              WIN32_FIND_DATAA *, lpFindFileData)
+{
+  return OSLibDosFindNext(hFindFile,lpFindFileData);
+}
+//******************************************************************************
+// internal function for faster access (SHELL32)
+//******************************************************************************
+ODINFUNCTION3(BOOL,   FindNextFileMultiA,
+              HANDLE, hFindFile,
+              WIN32_FIND_DATAA *, lpFindFileData,
+              DWORD *,count)
+{
+  return OSLibDosFindNextMulti(hFindFile,lpFindFileData,count);
+}
+//******************************************************************************
+//******************************************************************************
+ODINFUNCTION2(BOOL, FindNextFileW,
+              HANDLE, hFindFile,
+              WIN32_FIND_DATAW *, lpFindFileData)
+{
+  WIN32_FIND_DATAA wfda;
+  BOOL             rc;
+
+  rc = OSLibDosFindNext(hFindFile,&wfda);
+
+  if(rc == 0) {
+        memset(lpFindFileData, 0, sizeof(WIN32_FIND_DATAW));
+  }
+  else {
+        // convert back the result structure
+        memcpy(lpFindFileData,
                &wfda,
                sizeof(WIN32_FIND_DATAA));
 
-        lstrcpynAtoW (arg2->cFileName,
+        lstrcpynAtoW (lpFindFileData->cFileName,
                       wfda.cFileName,
                       sizeof(wfda.cFileName));
 
-        lstrcpynAtoW (arg2->cAlternateFileName,
+        lstrcpynAtoW (lpFindFileData->cAlternateFileName,
                       wfda.cAlternateFileName,
                       sizeof(wfda.cAlternateFileName));
@@ -158 +176 @@
 //******************************************************************************
 ODINFUNCTION1(BOOL, FindClose,
-              HANDLE, arg1)
-{
-  return O32_FindClose(arg1);
+              HANDLE, hFindFile)
+{
+  return OSLibDosFindClose(hFindFile);
 }
 //******************************************************************************
@@ -380 +398 @@
     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);
+         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);