Changeset 6249 for trunk/src

Timestamp:

Jul 8, 2001, 1:02:10 PM (24 years ago)

Author:

sandervl

Message:

crtdll rename entry + atom fs corruption fixes

Location:

trunk/src/kernel32

Files:

• atom.cpp (modified) (2 diffs)
• windllbase.cpp (modified) (2 diffs)

trunk/src/kernel32/atom.cpp

@@ -1 @@
-/* $Id: atom.cpp,v 1.9 2001-07-07 13:58:37 sandervl Exp $ */
+/* $Id: atom.cpp,v 1.10 2001-07-08 11:02:10 sandervl Exp $ */
 
 /*
@@ -32 +32 @@
 ATOM APIENTRY LookupAtom(HATOMTBL hAtomTbl, PSZ psz, ULONG actionMask);
 
+inline ATOM _LookupAtom(HATOMTBL hAtomTbl, PSZ psz, ULONG actionMask)
+{
+ ATOM yyrc;
+ USHORT sel = RestoreOS2FS();
+
+    yyrc = LookupAtom(hAtomTbl, psz, actionMask);
+    SetFS(sel);
+
+    return yyrc;
+}
+
+#undef  LookupAtom
+#define LookupAtom _LookupAtom
+
+
 HATOMTBL privateAtomTable = NULL;
 HATOMTBL systemAtomTable  = NULL;

trunk/src/kernel32/windllbase.cpp

@@ -1 @@
-/* $Id: windllbase.cpp,v 1.26 2001-06-15 09:42:47 bird Exp $ */
+/* $Id: windllbase.cpp,v 1.27 2001-07-08 11:02:10 sandervl Exp $ */
 
 /*
@@ -687 +687 @@
         PROFILE_SetOdinIniString(DLLRENAMEOS2_SECTION, "MCICDA", "MCICDA.DRV");
     }
+    if(PROFILE_GetOdinIniString(DLLRENAMEWIN_SECTION, "CRTDLL", "", renameddll,
+                                sizeof(renameddll)-1) <= 1)
+    {
+        PROFILE_SetOdinIniString(DLLRENAMEWIN_SECTION, "CRTDLL",   "CRTDLL32");
+        PROFILE_SetOdinIniString(DLLRENAMEOS2_SECTION, "CRTDLL32", "CRTDLL");
+    }
 }
 //******************************************************************************