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

Timestamp:

Nov 8, 1999, 2:43:13 PM (26 years ago)

Author:

sandervl

Message:

thread, SearchPath + handlemanager fixes

File:

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

trunk/src/kernel32/Fileio.cpp

@@ -1 @@
-/* $Id: Fileio.cpp,v 1.13 1999-11-03 17:12:20 phaller Exp $ */
+/* $Id: Fileio.cpp,v 1.14 1999-11-08 13:43:11 sandervl Exp $ */
 
 /*
@@ -30 +30 @@
 #include "oslibdos.h"
 
-
 ODINDEBUGCHANNEL(KERNEL32-FILEIO)
 
@@ -360 +359 @@
                       nrbyteswritten,
                       lpOverlapped));
-}
-//******************************************************************************
-//******************************************************************************
-ODINFUNCTION6(DWORD,  SearchPathA,
-              LPCSTR, lpszPath,
-              LPCSTR, lpszFile,
-              LPCSTR, lpszExtension,
-              DWORD,  cchReturnBuffer,
-              LPSTR,  lpszReturnBuffer,
-              LPSTR *, plpszFilePart)
-{
-  LPSTR lpszFilePart;
-
-  // @@@PH 1999/11/03 ANV.EXE seems to pass in NULL here, looks like
-  // windows ignores that behaviour altough it's undocumented.
-  if (plpszFilePart == NULL)
-    plpszFilePart = &lpszFilePart; // just provide a valid pointer
-
-  return O32_SearchPath(lpszPath,
-                        lpszFile,
-                        lpszExtension,
-                        cchReturnBuffer,
-                        lpszReturnBuffer,
-                        plpszFilePart);
-}
-//******************************************************************************
-//******************************************************************************
-ODINFUNCTION6(DWORD,    SearchPathW,
-              LPCWSTR,  lpszPath,
-              LPCWSTR,  lpszFileName,
-              LPCWSTR,  lpszExtension,
-              DWORD,    cchReturnBufferLength,
-              LPWSTR,   lpszReturnBuffer,
-              LPWSTR *, plpszFilePart)
-{
-  char *asciipath,
-       *asciifile,
-       *asciiext,
-       *asciibuffer,
-       *asciipart;
-  DWORD rc;
-
-  asciibuffer = (char *)malloc(cchReturnBufferLength+1);
-  asciipath = UnicodeToAsciiString((LPWSTR)lpszPath);
-  asciifile = UnicodeToAsciiString((LPWSTR)lpszFileName);
-  asciiext  = UnicodeToAsciiString((LPWSTR)lpszExtension);
-  rc = ODIN_SearchPathA(asciipath,
-                        asciifile,
-                        asciiext,
-                        cchReturnBufferLength,
-                        asciibuffer,
-                        &asciipart);
-
-  if(rc)
-  {
-      AsciiToUnicode(asciibuffer, lpszReturnBuffer);
-      *plpszFilePart = lpszReturnBuffer + ((int)asciipart - (int)asciibuffer);
-  }
-
-  FreeAsciiString(asciiext);
-  FreeAsciiString(asciifile);
-  FreeAsciiString(asciipath);
-  free(asciibuffer);
-  return(rc);
 }
 //******************************************************************************