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

Timestamp:

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

Author:

sandervl

Message:

thread, SearchPath + handlemanager fixes

File:

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

trunk/src/kernel32/directory.cpp

@@ -1 @@
-/* $Id: directory.cpp,v 1.8 1999-10-28 12:01:12 sandervl Exp $ */
+/* $Id: directory.cpp,v 1.9 1999-11-08 13:43:12 sandervl Exp $ */
 
 /*
@@ -6 +6 @@
  * Copyright 1998 Sander van Leeuwen
  *
+ * Parts based on Wine code (991031) (files\directory.c)
+ *
+ * DOS directories functions
+ *
+ * Copyright 1995 Alexandre Julliard
  *
  * Project Odin Software License can be found in LICENSE.TXT
@@ -24 +29 @@
 #include <options.h>
 #include "initterm.h"
+#include <win\file.h>
+#include <string.h>
+#include "oslibdos.h"
 
 ODINDEBUGCHANNEL(KERNEL32-DIRECTORY)
 
+
+static char DIR_Windows[MAX_PATHNAME_LEN];
+static char DIR_System[MAX_PATHNAME_LEN];
+
+//******************************************************************************
+//******************************************************************************
+void InitDirectories()
+{
+        GetWindowsDirectoryA((LPSTR)&DIR_Windows, sizeof(DIR_Windows));
+        GetSystemDirectoryA((LPSTR)&DIR_System, sizeof(DIR_System));
+}
 
 /*****************************************************************************
@@ -130 +149 @@
                                     PSECURITY_ATTRIBUTES,arg2)
 {
+  dprintf(("CreateDirectory %s", arg1));
   return O32_CreateDirectory(arg1, arg2);
 }
@@ -342 +362 @@
 }
 
+/***********************************************************************
+ *           DIR_TryModulePath
+ *
+ * Helper function for DIR_SearchPath.
+ */
+static BOOL DIR_TryModulePath( LPCSTR name, char *full_name )
+{
+    char buffer[OFS_MAXPATHNAME];
+    LPSTR p;
+
+    if (!GetModuleFileNameA( 0, buffer, sizeof(buffer) ))
+        buffer[0]='\0';
+
+    if (!(p = strrchr( buffer, '\\' ))) return FALSE;
+    if (sizeof(buffer) - (++p - buffer) <= strlen(name)) return FALSE;
+    strcpy( p, name );
+
+    return OSLibDosSearchPath(OSLIB_SEARCHFILE, NULL, buffer, full_name, MAX_PATHNAME_LEN);
+}
+
+
+/***********************************************************************
+ *           DIR_SearchPath
+ *
+ * Implementation of SearchPath32A. 'win32' specifies whether the search
+ * order is Win16 (module path last) or Win32 (module path first).
+ *
+ * FIXME: should return long path names.
+ */
+DWORD DIR_SearchPath( LPCSTR path, LPCSTR name, LPCSTR ext,
+                      char *full_name )
+{
+    DWORD len;
+    LPCSTR p;
+    LPSTR tmp = NULL;
+    BOOL ret = TRUE;
+
+    /* First check the supplied parameters */
+
+    p = strrchr( name, '.' );
+    if (p && !strchr( p, '/' ) && !strchr( p, '\\' ))
+        ext = NULL;  /* Ignore the specified extension */
+    if ((*name && (name[1] == ':')) ||
+        strchr( name, '/' ) || strchr( name, '\\' ))
+        path = NULL;  /* Ignore path if name already contains a path */
+    if (path && !*path) path = NULL;  /* Ignore empty path */
+
+    len = strlen(name);
+    if (ext) len += strlen(ext);
+    if (path) len += strlen(path) + 1;
+
+    /* Allocate a buffer for the file name and extension */
+
+    if (path || ext)
+    {
+        if (!(tmp = (LPSTR)HeapAlloc( GetProcessHeap(), 0, len + 1 )))
+        {
+            SetLastError( ERROR_OUTOFMEMORY );
+            return 0;
+        }
+        if (path)
+        {
+            strcpy( tmp, path );
+            strcat( tmp, "\\" );
+            strcat( tmp, name );
+        }
+        else strcpy( tmp, name );
+        if (ext) strcat( tmp, ext );
+        name = tmp;
+    }
+    
+    /* If we have an explicit path, everything's easy */
+
+    if (path || (*name && (name[1] == ':')) ||
+        strchr( name, '/' ) || strchr( name, '\\' ))
+    {
+        ret = OSLibDosSearchPath(OSLIB_SEARCHFILE, NULL, (LPSTR)name, full_name, MAX_PATHNAME_LEN);
+        goto done;
+    }
+
+    /* Try the path of the current executable (for Win32 search order) */
+    if (DIR_TryModulePath( name, full_name )) goto done;
+
+    /* Try the current directory */
+    if (OSLibDosSearchPath(OSLIB_SEARCHCURDIR, NULL, (LPSTR)name, full_name, MAX_PATHNAME_LEN))
+        goto done;
+
+    /* Try the Windows system directory */
+    if (OSLibDosSearchPath(OSLIB_SEARCHDIR, (LPSTR)&DIR_System, (LPSTR)name, full_name, MAX_PATHNAME_LEN))
+        goto done;
+
+    /* Try the Windows directory */
+    if (OSLibDosSearchPath(OSLIB_SEARCHDIR, (LPSTR)&DIR_Windows, (LPSTR)name, full_name, MAX_PATHNAME_LEN))
+        goto done;
+
+    /* Try all directories in path */
+    ret = OSLibDosSearchPath(OSLIB_SEARCHENV, "PATH", (LPSTR)name, full_name, MAX_PATHNAME_LEN);
+
+done:
+    if (tmp) HeapFree( GetProcessHeap(), 0, tmp );
+    return ret;
+}
+
+
+/***********************************************************************
+ * SearchPath32A [KERNEL32.447]
+ *
+ * Searches for a specified file in the search path.
+ *
+ * PARAMS
+ *    path      [I] Path to search
+ *    name      [I] Filename to search for.
+ *    ext       [I] File extension to append to file name. The first
+ *                  character must be a period. This parameter is
+ *                  specified only if the filename given does not
+ *                  contain an extension.
+ *    buflen    [I] size of buffer, in characters
+ *    buffer    [O] buffer for found filename
+ *    lastpart  [O] address of pointer to last used character in
+ *                  buffer (the final '\')
+ *
+ * RETURNS
+ *    Success: length of string copied into buffer, not including
+ *             terminating null character. If the filename found is
+ *             longer than the length of the buffer, the length of the
+ *             filename is returned.
+ *    Failure: Zero
+ * 
+ * NOTES
+ *    Should call SetLastError(but currently doesn't).
+ */
+DWORD WINAPI SearchPathA(LPCSTR path, LPCSTR name, LPCSTR ext, DWORD buflen,
+                         LPSTR buffer, LPSTR *lastpart )
+{
+    char full_name[MAX_PATHNAME_LEN];
+
+    if (!DIR_SearchPath( path, name, ext, (LPSTR)full_name )) return 0;
+    lstrcpynA( buffer, (LPSTR)full_name, buflen-1);
+    buffer[buflen-2] = 0;
+    SetLastError(0);
+    return strlen(buffer);
+}
+
+
+/***********************************************************************
+ *           SearchPath32W   (KERNEL32.448)
+ */
+DWORD WINAPI SearchPathW(LPCWSTR path, LPCWSTR name, LPCWSTR ext,
+                         DWORD buflen, LPWSTR buffer, LPWSTR *lastpart )
+{
+    char full_name[MAX_PATHNAME_LEN];
+
+    LPSTR pathA = HEAP_strdupWtoA( GetProcessHeap(), 0, path );
+    LPSTR nameA = HEAP_strdupWtoA( GetProcessHeap(), 0, name );
+    LPSTR extA  = HEAP_strdupWtoA( GetProcessHeap(), 0, ext );
+    DWORD ret = DIR_SearchPath( pathA, nameA, extA, (LPSTR)full_name );
+    HeapFree( GetProcessHeap(), 0, extA );
+    HeapFree( GetProcessHeap(), 0, nameA );
+    HeapFree( GetProcessHeap(), 0, pathA );
+    if (!ret) return 0;
+
+    lstrcpynAtoW( buffer, full_name, buflen-1 );
+    buffer[buflen-2] = 0;
+    SetLastError(0);
+    return strlen(full_name);
+}