Changeset 21302 for trunk/src/kernel32/oslibdos.cpp

Timestamp:

Jun 18, 2009, 11:53:26 AM (16 years ago)

Author:

ydario

Message:

Kernel32 updates.

File:

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

trunk/src/kernel32/oslibdos.cpp

@@ -265 +265 @@
     case ERROR_WRONG_DISK: //34
         return ERROR_WRONG_DISK_W;
+
+    case ERROR_BAD_NETPATH: //53
+        return ERROR_BAD_NETPATH_W;
 
     case ERROR_SHARING_BUFFER_EXCEEDED: //36
@@ -1045 +1048 @@
       // @@@AH 2001-06-02 Win2k SP2 returns error 2 in this case
       int winError = error2WinError(rc);
-      if (winError == ERROR_OPEN_FAILED_W || winError == ERROR_PATH_NOT_FOUND_W)
+      if (winError == ERROR_OPEN_FAILED_W)
       {
           //Windows returns ERROR_FILE_EXISTS if create new & file exists
@@ -2383 +2386 @@
 {
    FILESTATUS3 statusBuf;
-   char        lOemFileName[CCHMAXPATH];
+   char        *lOemFileName;
    char       *lpszBackslash, *lpszColon;
    APIRET      rc;
 
-//testestest
-   if(strlen(lpFileName) > CCHMAXPATH) DebugInt3();
-//testestset
+   lOemFileName = (char *)malloc(strlen(lpFileName)+64);
+   lOemFileName[0] = 0;
 
    //Convert file name from Windows to OS/2 codepage
@@ -2399 +2401 @@
        {
            lpszColon = CharPrevA(lOemFileName, lpszBackslash);
-           if(lpszColon && *lpszColon != ':') 
+           if(strlen(lOemFileName) > 1 && lpszColon && *lpszColon != ':') 
            {//only rootdir is allowed to have terminating backslash
                *lpszBackslash = 0;
@@ -2420 +2422 @@
            rc = DosQueryPathInfo(lOemFileName, FIL_STANDARD, &statusBuf, sizeof(statusBuf));
    }
+   free(lOemFileName);
 
    if(rc == NO_ERROR)