Changeset 3380 for trunk/src

Timestamp:

Apr 15, 2000, 12:00:45 PM (25 years ago)

Author:

sandervl

Message:

file map flush & FindFirstA fixes

Location:

trunk/src/kernel32

Files:

• Fileio.cpp (modified) (2 diffs)
• mmap.cpp (modified) (2 diffs)

trunk/src/kernel32/Fileio.cpp

@@ -1 @@
-/* $Id: Fileio.cpp,v 1.28 2000-04-14 22:35:25 sandervl Exp $ */
+/* $Id: Fileio.cpp,v 1.29 2000-04-15 10:00:44 sandervl Exp $ */
 
 /*
@@ -80 +80 @@
               WIN32_FIND_DATAA *, lpFindFileData)
 {
-  return (HANDLE)OSLibDosFindFirst(lpFileName,lpFindFileData);
+ HANDLE hFind;
+ char  *filename;
+ int    namelen;
+
+  dprintf(("FindFirstFileA %s", lpFileName));
+  if(lpFileName == NULL || lpFindFileData == NULL) {
+        SetLastError(ERROR_INVALID_PARAMETER);
+        return -1;
+  }
+  namelen = strlen(lpFileName);
+  if(lpFileName[namelen-1] == '\\') {
+        filename = (char *)alloca(namelen+1);
+        strcpy(filename, lpFileName);
+        filename[namelen-1] = 0;
+  }
+  else  filename = (char *)lpFileName;
+
+  return (HANDLE)OSLibDosFindFirst(filename,lpFindFileData);
 }
 //******************************************************************************

trunk/src/kernel32/mmap.cpp

@@ -1 @@
-/* $Id: mmap.cpp,v 1.38 2000-03-28 17:11:49 sandervl Exp $ */
+/* $Id: mmap.cpp,v 1.39 2000-04-15 10:00:45 sandervl Exp $ */
 
 /*
@@ -425 +425 @@
 
   while(cbFlush) {
-        if(VirtualQuery((LPSTR)lpvBase, &memInfo, cbFlush) == 0) {
+        if(VirtualQuery((LPSTR)lpvBase, &memInfo, sizeof(MEMORY_BASIC_INFORMATION)) == 0) {
                 dprintf(("Win32MemMap::flushView: VirtualQuery (%x,%x) failed for %x", lpvBase, cbFlush, (ULONG)lpvBase+i*PAGE_SIZE));
                 goto fail;