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

Timestamp:

Aug 5, 2010, 10:43:01 PM (15 years ago)

Author:

dmik

Message:

Added mapping of OS/2's ERROR_INIT_ROUTINE_FAILED to Win32's ERROR_DLL_INIT_FAILED_W.

File:

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

trunk/src/kernel32/oslibdos.cpp

@@ -394 +394 @@
         return ERROR_EAS_DIDNT_FIT;
 
+    case ERROR_INIT_ROUTINE_FAILED: //295
+        return ERROR_DLL_INIT_FAILED_W;
+
     // device driver specific error codes (I24)
     case ERROR_USER_DEFINED_BASE + ERROR_I24_WRITE_PROTECT:
@@ -587 +590 @@
       rc = DosMove((PSZ)lOemOldFile, (PSZ)lOemNewFile);
       SetLastError(error2WinError(rc));
-  }     
+  }
   return (rc == NO_ERROR);
 }
@@ -981 +984 @@
         openMode |= OPEN_ACCESS_READONLY;
    else
-   //mgp: There seems to be a problem where OPEN_ACCESS_WRITEONLY gives an 
-   //     Access Error (0x05) if the file is opened with 
-   //     OPEN_ACTION_OPEN_IF_EXISTS.  So, in that case, change it to 
+   //mgp: There seems to be a problem where OPEN_ACCESS_WRITEONLY gives an
+   //     Access Error (0x05) if the file is opened with
+   //     OPEN_ACTION_OPEN_IF_EXISTS.  So, in that case, change it to
    //     OPEN_ACCESS_READWRITE
    if(fuAccess & GENERIC_WRITE_W)
@@ -1009 +1012 @@
         openMode |= OPEN_FLAGS_DASD;
    }
-   
+
    int retry = 0;
    while (retry < 3)
@@ -1314 +1317 @@
   APIRET   rc;
   DWORD    newoffset;
-  
+
   switch(method)
   {
@@ -1564 +1567 @@
    DWORD  ulMode;
    APIRET rc;
-   
+
    rc = DosQueryFHState(hFile, &ulMode);
    if(rc != NO_ERROR) return error2WinError(rc);
@@ -1574 +1577 @@
        ulMode &= ~OPEN_FLAGS_NOINHERIT;
    }
-   else 
+   else
        ulMode |= OPEN_FLAGS_NOINHERIT;
 
@@ -2299 +2302 @@
   {
     DosFindClose(hDir);
-   
+
     //Windows returns ERROR_FILE_NOT_FOUND if the file/directory is not present
     if(rc == ERROR_NO_MORE_FILES || rc == ERROR_PATH_NOT_FOUND) {
-         SetLastError(ERROR_FILE_NOT_FOUND_W); 
-    } 
+         SetLastError(ERROR_FILE_NOT_FOUND_W);
+    }
     else SetLastError(error2WinError(rc));
     return INVALID_HANDLE_VALUE_W;
@@ -2435 +2438 @@
        {
            lpszColon = CharPrevA(lOemFileName, lpszBackslash);
-           if(lpszColon && *lpszColon != ':') 
+           if(lpszColon && *lpszColon != ':')
            {//only rootdir is allowed to have terminating backslash
                *lpszBackslash = 0;
@@ -3114 +3117 @@
  APIRET  rc;
  HMODULE hModule = NULLHANDLE;
- char    name[ CCHMAXPATH ];
-
+ char    name[ CCHMAXPATH ] = { '\0' };
+
+//dprintf(("*** 1 %s", szModName));
   rc = DosLoadModule(name, CCHMAXPATH, szModName, &hModule);
+//dprintf(("*** 2 %d %x [%s]", rc, hModule, name));
+//HMODULE hm1 = NULLHANDLE, hm2 = NULLHANDLE;
+//DosQueryModuleHandle(szModName, &hm1);
+//APIRET rc2 = DosQueryModuleHandle("JVM.DLL", &hm2);
+//name[0] = '!';
+//name[1] = '\0';
+//if (!rc2) {
+//name[0] = '\0';
+//rc2 = DosQueryModuleName(hm2, CCHMAXPATH, name);
+//}
+//dprintf(("*** 3 %x %d %x [%s]", hm1, rc2, hm2, name));
   if(rc) {
       SetLastError(error2WinError(rc,ERROR_FILE_NOT_FOUND));
@@ -3360 +3375 @@
         dprintf(("DosPhysicalDisk error: return code = %u\n", rc));
         return 0;
-    } 
+    }
     else {
         dprintf(("DosPhysicalDisk:  %u partitionable disk(s)\n",usNumDrives));