Changeset 4739 for trunk/src

Timestamp:

Dec 3, 2000, 11:12:33 AM (25 years ago)

Author:

sandervl

Message:

Added renaming for mcicda

Location:

trunk/src/kernel32

Files:

• HandleManager.cpp (modified) (3 diffs)
• disk.cpp (modified) (2 diffs)
• windllbase.cpp (modified) (2 diffs)

trunk/src/kernel32/HandleManager.cpp

@@ -1 @@
-/* $Id: HandleManager.cpp,v 1.55 2000-11-24 16:16:18 phaller Exp $ */
+/* $Id: HandleManager.cpp,v 1.56 2000-12-03 10:12:32 sandervl Exp $ */
 
 /*
@@ -294 +294 @@
  * Variables :
  * Result    : index or -1 in case of error
- * Remark    :
+ * Remark    : Should fail for standard handles (in/out/err)!!!!!!!!!!
+ *             HMGetFileType depends on this!!!
  * Status    :
  *
@@ -1375 +1376 @@
   {
     //Must return FILE_TYPE_CHAR here; (used to fail index check)
+    //---------->>> ASSUMES that _HMHandleQuery failes!!!!!!!!!!!!!!!!
     if((hFile == GetStdHandle(STD_INPUT_HANDLE)) ||
        (hFile == GetStdHandle(STD_OUTPUT_HANDLE)) ||

trunk/src/kernel32/disk.cpp

@@ -1 @@
-/* $Id: disk.cpp,v 1.19 2000-11-24 16:15:39 phaller Exp $ */
+/* $Id: disk.cpp,v 1.20 2000-12-03 10:12:33 sandervl Exp $ */
 
 /*
@@ -100 +100 @@
 
   astring = UnicodeToAsciiString((LPWSTR)arg1);
-  rc = GetDiskFreeSpaceA(astring, arg2, arg3, arg4, arg5);
+  rc = CALL_ODINFUNC(GetDiskFreeSpaceA)(astring, arg2, arg3, arg4, arg5);
   FreeAsciiString(astring);
   return(rc);

trunk/src/kernel32/windllbase.cpp

@@ -1 @@
-/* $Id: windllbase.cpp,v 1.22 2000-11-21 11:35:09 sandervl Exp $ */
+/* $Id: windllbase.cpp,v 1.23 2000-12-03 10:12:33 sandervl Exp $ */
 
 /*
@@ -673 +673 @@
         PROFILE_SetOdinIniString(DLLRENAMEOS2_SECTION, "WINSPOOL", "WINSPOOL.DRV");
     }
+    if(PROFILE_GetOdinIniString(DLLRENAMEWIN_SECTION, "MCICDA", "", renameddll,
+                                sizeof(renameddll)-1) <= 1)
+    {
+        PROFILE_SetOdinIniString(DLLRENAMEWIN_SECTION, "MCICDA", "MCICDA.DLL");
+        PROFILE_SetOdinIniString(DLLRENAMEOS2_SECTION, "MCICDA", "MCICDA.DRV");
+    }
 }
 //******************************************************************************