Changeset 4164 for trunk/src/win32k/k32/k32AllocMemEx.cpp

Timestamp:

Sep 2, 2000, 11:08:23 PM (25 years ago)

Author:

bird

Message:

Merged in the Grace branch. New Win32k!

File:

• trunk/src/win32k/k32/k32AllocMemEx.cpp (modified) (5 diffs)

trunk/src/win32k/k32/k32AllocMemEx.cpp

@@ -1 @@
-/* $Id: k32AllocMemEx.cpp,v 1.2 2000-02-18 19:27:30 bird Exp $
+/* $Id: k32AllocMemEx.cpp,v 1.3 2000-09-02 21:08:05 bird Exp $
  *
  * k32AllocMemEx - Equivalent to DosAllocMem, but this one
@@ -18 +18 @@
 #define INCL_OS2KRNL_VM
 
+#define NO_WIN32K_LIB_FUNCTIONS
+
 #ifndef OBJ_SELMAPALL
 #define OBJ_SELMAPALL   0x00000800UL
@@ -27 +29 @@
 *******************************************************************************/
 #include <os2.h>
+#include "devSegDf.h"                   /* Win32k segment definitions. */
 #include "OS2Krnl.h"
+#include "win32k.h"
 #include "k32.h"
 #include "options.h"
 #include "dev32.h"
 #include "log.h"
+#include "macros.h"
 
 
@@ -95 +100 @@
 APIRET k32AllocMemEx(PPVOID ppv, ULONG cb, ULONG flag, ULONG ulCS, ULONG ulEIP)
 {
+    #if 0
     APIRET  rc;
     ULONG   flFlags2;
@@ -133 +139 @@
 
     return rc;
+    #else
+    NOREF(ppv);
+    NOREF(cb);
+    NOREF(flag);
+    NOREF(ulCS);
+    NOREF(ulEIP);
+    return ERROR_NOT_SUPPORTED;
+    #endif
 }