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

Timestamp:

Aug 25, 1999, 1:46:36 AM (26 years ago)

Author:

phaller

Message:

Add: added FindFirstFileW / FindNextFileW

File:

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

trunk/src/kernel32/Fileio.cpp

@@ -1 @@
-/* $Id: Fileio.cpp,v 1.7 1999-07-13 10:38:33 sandervl Exp $ */
+/* $Id: Fileio.cpp,v 1.8 1999-08-24 23:46:36 phaller Exp $ */
 
 /*
@@ -17 +17 @@
 #include <string.h>
 #include "unicode.h"
+#include <heapstring.h>
 #include "handlemanager.h"
 #include "devio.h"
@@ -74 +75 @@
 HANDLE WIN32API FindFirstFileA(LPCSTR arg1, WIN32_FIND_DATAA * arg2)
 {
-    dprintf(("KERNEL32:  FindFirstFile %s\n", arg1));
+    dprintf(("KERNEL32:  FindFirstFile(%s,%08xh)\n",
+             arg1,
+             arg2));
 
     return O32_FindFirstFile(arg1, arg2);
@@ -82 +85 @@
 HANDLE WIN32API FindFirstFileW(LPCWSTR arg1, WIN32_FIND_DATAW *  arg2)
 {
- HANDLE rc;
- char  *astring;
-
-    dprintf(("KERNEL32: FindFirstFileW: not implemented!!"));
-
-    astring = UnicodeToAsciiString((LPWSTR)arg1);
-//    rc = O32_FindFirstFile(astring, arg2);
-    rc = 0;
-    FreeAsciiString(astring);
-    return(rc);
+  HANDLE           rc;
+  char             *astring;
+  WIN32_FIND_DATAA wfda;
+
+  dprintf(("KERNEL32: FindFirstFileW(%08xh, %08xh)",
+           arg1,
+           arg2));
+
+  astring = UnicodeToAsciiString((LPWSTR)arg1);
+  rc = FindFirstFileA(astring, &wfda);
+
+  // 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);
 }
 //******************************************************************************
@@ -105 +124 @@
 BOOL WIN32API FindNextFileW(HANDLE arg1, WIN32_FIND_DATAW * arg2)
 {
-    dprintf(("KERNEL32:  FindNextFileW Not properly implemented!\n"));
-//    return O32_FindNextFile(arg1, arg2);
-    return 0;
+  WIN32_FIND_DATAA wfda;
+  BOOL             rc;
+
+  dprintf(("KERNEL32:  FindNextFileW(%08xh, %08xh)\n",
+           arg1,
+           arg2));
+
+  rc = FindNextFileA(arg1, &wfda);
+
+  // 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));
+
+  return rc;
 }
 //******************************************************************************