Changeset 435 for trunk/src/kernel32

Timestamp:

Aug 6, 1999, 2:14:12 PM (26 years ago)

Author:

phaller

Message:

Fix: Heap changes

Location:

trunk/src/kernel32

Files:

• console.cpp (modified) (3 diffs)
• heapstring.cpp (modified) (2 diffs)
• misc.cpp (modified) (5 diffs)

trunk/src/kernel32/console.cpp

@@ -1 @@
-/* $Id: console.cpp,v 1.10 1999-07-12 17:45:51 phaller Exp $ */
+/* $Id: console.cpp,v 1.11 1999-08-06 12:14:10 phaller Exp $ */
 
 /*
@@ -53 +53 @@
  * Includes                                                                  *
  *****************************************************************************/
+
+#include <builtin.h>
+#include <stdlib.h>
+#include <string.h>
 
 #define  INCL_WIN
@@ -63 +67 @@
 #define  INCL_AVIO
 #include <os2wrap.h>         //Odin32 OS/2 api wrappers
-#include <builtin.h>
-#include <stdlib.h>
-#include <string.h>
 
 #include <win32type.h>

trunk/src/kernel32/heapstring.cpp

@@ -656 +656 @@
   if (!p)
   {
-    dprintf(("KERNEL32: HEAP_malloc(%08xh,%08xh,%08xh) out of memory.\n",
-             heap,
-             flags,
+    dprintf(("KERNEL32: HEAP_malloc(%08xh) out of memory.\n",
              size));
   }
@@ -682 +680 @@
   if (!p)
   {
-    dprintf(("KERNEL32: HEAP_realloc(%08xh,%08xh,%08xh,%08xh) out of memory.\n",
-             heap,
-             flags,
+    dprintf(("KERNEL32: HEAP_realloc(%08xh,%08xh) out of memory.\n",
              lpMem,
              size));

trunk/src/kernel32/misc.cpp

@@ -1 @@
-/* $Id: misc.cpp,v 1.4 1999-08-06 09:03:04 phaller Exp $ */
+/* $Id: misc.cpp,v 1.5 1999-08-06 12:14:12 phaller Exp $ */
 
 /*
@@ -246 +246 @@
 int SYSTEM EXPORT WriteLog(char *tekst, ...)
 {
-  USHORT  sel = RestoreOS2FS();
+//  USHORT  sel = RestoreOS2FS();
   va_list argptr;
 
@@ -269 +269 @@
   }
 
-  SetFS(sel);
+//  SetFS(sel);
   return 1;
 }
@@ -275 +275 @@
 int SYSTEM EXPORT WriteLogError(char *tekst, ...)
 {
-  USHORT  sel = RestoreOS2FS();
+//  USHORT  sel = RestoreOS2FS();
   va_list argptr;
 
@@ -285 +285 @@
     printf("\n");
 
-  SetFS(sel);
+//  SetFS(sel);
   return 1;
 }