Changeset 9815 for trunk/src

Timestamp:

Feb 17, 2003, 12:31:43 PM (23 years ago)

Author:

sandervl

Message:

FindFirstFile: return ERROR_FILE_NOT_FOUND if DosFindFirst returns ERROR_PATH_NOT_FOUND

Location:

trunk/src/kernel32

Files:

• Fileio.cpp (modified) (4 diffs)
• oslibdos.cpp (modified) (3 diffs)

trunk/src/kernel32/Fileio.cpp

@@ -1 @@
-/* $Id: Fileio.cpp,v 1.68 2002-08-22 14:21:26 sandervl Exp $ */
+/* $Id: Fileio.cpp,v 1.69 2003-02-17 11:31:42 sandervl Exp $ */
 
 /*
@@ -662 +662 @@
 //******************************************************************************
 //******************************************************************************
-UINT WIN32API GetTempFileNameA(LPCSTR arg1, LPCSTR arg2, UINT arg3, LPSTR arg4)
-{
-  return O32_GetTempFileName(arg1, arg2, arg3, arg4);
+UINT WIN32API GetTempFileNameA(LPCSTR lpPathName, LPCSTR lpPrefixString, 
+                               UINT uUnique, LPSTR lpTempFileName)
+{
+    dprintf(("GetTempFileNameA %s %s", lpPathName, lpPrefixString));
+    return O32_GetTempFileName(lpPathName, lpPrefixString, uUnique, lpTempFileName);
 }
 //******************************************************************************
@@ -677 +679 @@
   asciipath   = UnicodeToAsciiString((LPWSTR)lpPathName);
   asciiprefix = UnicodeToAsciiString((LPWSTR)lpPrefixString);
-  rc = O32_GetTempFileName(asciipath, asciiprefix, uUnique, asciitemp);
+  rc = GetTempFileNameA(asciipath, asciiprefix, uUnique, asciitemp);
   if(rc)      AsciiToUnicode(asciitemp, lpTempFileName);
   FreeAsciiString(asciiprefix);
@@ -893 +895 @@
                         asciibuffer, &asciipart);
 
-  dprintf(("KERNEL32: GetFullPathNameW %s returns %s\n",
+  dprintf(("KERNEL32: GetFullPathNameW %s returns %s\n%s",
            astring,
-           asciibuffer));
+           asciibuffer, asciipart));
 
   if(rc && asciibuffer)

trunk/src/kernel32/oslibdos.cpp

@@ -1 @@
-/* $Id: oslibdos.cpp,v 1.114 2003-01-20 10:46:27 sandervl Exp $ */
+/* $Id: oslibdos.cpp,v 1.115 2003-02-17 11:31:43 sandervl Exp $ */
 /*
  * Wrappers for OS/2 Dos* API
@@ -2219 +2219 @@
    
     //Windows returns ERROR_FILE_NOT_FOUND if the file/directory is not present
-    if(rc == ERROR_NO_MORE_FILES) {
+    if(rc == ERROR_NO_MORE_FILES || rc == ERROR_PATH_NOT_FOUND) {
          SetLastError(ERROR_FILE_NOT_FOUND_W); 
     } 
@@ -2340 +2340 @@
    char       *lpszBackslash, *lpszColon;
    APIRET      rc;
+
+//testestest
+   if(strlen(lpFileName) > CCHMAXPATH) DebugInt3();
+//testestset
 
    //Convert file name from Windows to OS/2 codepage