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

Timestamp:

Oct 26, 2000, 7:21:39 PM (25 years ago)

Author:

sandervl

Message:

registry fixes (heap corruption) + VirtualAlloc change

File:

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

trunk/src/kernel32/Fileio.cpp

@@ -1 @@
-/* $Id: Fileio.cpp,v 1.43 2000-10-02 18:39:32 sandervl Exp $ */
+/* $Id: Fileio.cpp,v 1.44 2000-10-26 17:21:38 sandervl Exp $ */
 
 /*
  * Win32 File IO API functions for OS/2
  *
- * Copyright 1998 Sander van Leeuwen
+ * Copyright 1998-2000 Sander van Leeuwen
  * Copyright 1998 Patrick Haller
  *
@@ -89 +89 @@
  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);
+    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);
 }
 //******************************************************************************
@@ -112 +112 @@
               DWORD *,count)
 {
-  return (HANDLE)OSLibDosFindFirstMulti(lpFileName,lpFindFileData,count);
+    return (HANDLE)OSLibDosFindFirstMulti(lpFileName,lpFindFileData,count);
 }
 //******************************************************************************
@@ -124 +124 @@
   WIN32_FIND_DATAA wfda;
 
-  astring = UnicodeToAsciiString((LPWSTR)lpFileName);
-  rc = (HANDLE)OSLibDosFindFirst(astring,&wfda);
-
-  if(rc == -1) {
+    astring = UnicodeToAsciiString((LPWSTR)lpFileName);
+    dprintf(("FindFirstFileW %s", astring));
+    rc = (HANDLE)OSLibDosFindFirst(astring,&wfda);
+
+    if(rc == -1) {
         memset(lpFindFileData, 0, sizeof(WIN32_FIND_DATAW));
-  }
-  else {
+    }
+    else {
         // convert back the result structure
         memcpy(lpFindFileData,
@@ -143 +144 @@
                       wfda.cAlternateFileName,
                       sizeof(wfda.cAlternateFileName));
-  }
-  FreeAsciiString(astring);
-  return(rc);
+    }
+    FreeAsciiString(astring);
+    return(rc);
 }
 //******************************************************************************
@@ -153 +154 @@
               WIN32_FIND_DATAA *, lpFindFileData)
 {
-  return OSLibDosFindNext(hFindFile,lpFindFileData);
+    return OSLibDosFindNext(hFindFile,lpFindFileData);
 }
 //******************************************************************************