Changeset 1271 for trunk/src/win32k/misc/new.cpp

Timestamp:

Oct 14, 1999, 3:19:22 AM (26 years ago)

Author:

bird

Message:

Changes during Pe2Lx rewrite.

File:

• trunk/src/win32k/misc/new.cpp (modified) (6 diffs)

trunk/src/win32k/misc/new.cpp

@@ -1 @@
-/* $Id: new.cpp,v 1.1 1999-09-06 02:20:02 bird Exp $
+/* $Id: new.cpp,v 1.2 1999-10-14 01:19:21 bird Exp $
  *
  * new - new and delete operators.
@@ -20 +20 @@
 
 #include "new.h"
-#include "cout.h"
 #include "malloc.h"
+#include "log.h"
 
 
+#pragma info(none)
 /**
  * New.
@@ -40 +41 @@
 void *operator new(size_t size, void *location)
 {
-    cout << "operator new(size,location) not implemented"<< endl;
+    dprintf(("operator new(size,location) not implemented\n"));
     return NULL;
 }
@@ -50 +51 @@
 void *operator new[](size_t size)
 {
-    cout << "operator new[](size) not implemented"<< endl;
+    dprintf(("operator new[](size) not implemented\n"));
     return NULL;
 }
@@ -60 +61 @@
 void *operator new[](size_t size, void *location)
 {
-    cout << "operator new[](size,location) not implemented"<< endl;
+    dprintf(("operator new[](size,location) not implemented\n"));
     return NULL;
 }
 
-
+#ifndef __DEBUG_ALLOC__
 /**
  * Delete.
@@ -80 +81 @@
 void operator delete[](void *location)
 {
-    cout << "operator delete[](location) - not implemented" << endl;
+    dprintf(("operator delete[](location) - not implemented\n"));
+}
+#endif
+
+/***
+ *  debug!
+ ***/
+
+/**
+ * New.
+ * @returns   pointer to allocated memory.
+ * @param     Size  Size requested.
+ */
+void *operator new(size_t size, const char *filename, size_t lineno)
+{
+    return malloc(size);
 }
 
+
+/**
+ * stub
+ */
+void *operator new(size_t size, const char *filename, size_t lineno, void *location)
+{
+    dprintf(("operator new(size,location) not implemented\n"));
+    return NULL;
+}
+
+
+/**
+ * stub
+ */
+void *operator new[](size_t size, const char *filename, size_t lineno)
+{
+    dprintf(("operator new[](size) not implemented\n"));
+    return NULL;
+}
+
+
+/**
+ * stub
+ */
+void *operator new[](size_t size, const char *filename, size_t lineno, void *location)
+{
+    dprintf(("operator new[](size,location) not implemented\n"));
+    return NULL;
+}
+
+#ifdef __DEBUG_ALLOC__
+/**
+ * Delete.
+ * @param     location  Pointer to memory block which are to be freed.
+ */
+void operator delete(void *location, const char *filename, size_t lineno)
+{
+    free(location);
+}
+
+
+/**
+ * stub
+ */
+void operator delete[](void *location, const char *filename, size_t lineno)
+{
+    dprintf(("operator delete[](location) - not implemented\n"));
+}
+#endif