Changeset 3259 for trunk/src/kernel32/hmopen32.cpp

Timestamp:

Mar 28, 2000, 7:11:50 PM (25 years ago)

Author:

sandervl

Message:

openfile, virtualquery + import name fixes

File:

• trunk/src/kernel32/hmopen32.cpp (modified) (4 diffs)

trunk/src/kernel32/hmopen32.cpp

@@ -1 @@
-/* $Id: hmopen32.cpp,v 1.19 2000-03-24 19:25:32 sandervl Exp $ */
+/* $Id: hmopen32.cpp,v 1.20 2000-03-28 17:11:49 sandervl Exp $ */
 
 /*
@@ -700 +700 @@
                                      PHMHANDLEDATA pHMHandleData,
                                      OFSTRUCT      *pOFStruct,
-                                     UINT          arg3)
+                                     UINT          fuMode)
 {
   HFILE hFile;
   FILETIME filetime;
   WORD filedatetime[2];
+  char filepath[260];
 
   dprintfl(("KERNEL32: HandleManager::Open32::OpenFile %s(%s,%08x,%08x,%08x) - stub?\n",
@@ -711 +712 @@
            pHMHandleData,
            pOFStruct,
-           arg3));
-
-  if (strcmp(lpFileName,       // "support" for local unc names
+           fuMode));
+
+  if(strcmp(lpFileName,       // "support" for local unc names
              "\\\\.\\") == 0)
+  {
     lpFileName+=4;
-
+  }
+  else 
+  if(!strchr(lpFileName, ':') && !strchr(lpFileName, '\\')) 
+  {
+        //filename only; search for file in following order
+        //1: dir from which the app loaded
+        //2: current dir
+        //3: windows system dir
+        //4: windows dir
+        //5: dirs in path path environment variable
+        //SearchPath does exactly that
+        LPSTR filenameinpath;
+
+        if(SearchPathA(NULL, lpFileName, NULL, sizeof(filepath), filepath, &filenameinpath) == 0
+           && !(fuMode & OF_CREATE) ) {
+                SetLastError(ERROR_FILE_NOT_FOUND);
+                return HFILE_ERROR;
+        }
+        lpFileName = filepath;
+  }
   // filling OFSTRUCT
   memset(pOFStruct, 0, sizeof(OFSTRUCT));
@@ -725 +746 @@
   hFile = O32_OpenFile(lpFileName,
                        pOFStruct,
-                       arg3);
+                       fuMode);
   if (hFile != INVALID_HANDLE_ERROR)
   {