Changeset 5224 for trunk/src/win32k/lib/libDosAllocMemEx.c

Timestamp:

Feb 21, 2001, 8:47:59 AM (25 years ago)

Author:

bird

Message:

CallGate changes.

File:

• trunk/src/win32k/lib/libDosAllocMemEx.c (modified) (4 diffs)

trunk/src/win32k/lib/libDosAllocMemEx.c

@@ -1 @@
-/* $Id: libDosAllocMemEx.c,v 1.7 2001-02-20 04:57:28 bird Exp $
+/* $Id: libDosAllocMemEx.c,v 1.8 2001-02-21 07:47:58 bird Exp $
  *
  * DosAllocMemEx - Extened Edition of DosAllocMem.
  *                 Allows you to suggest an address of the memory.
  *
- * Copyright (c) 2000 knut st. osmundsen (knut.stange.osmundsen@mynd.no)
+ * Copyright (c) 2000-2001 knut st. osmundsen (knut.stange.osmundsen@mynd.no)
  *
  * Project Odin Software License can be found in LICENSE.TXT
@@ -24 +24 @@
 #include <os2.h>
 #include "win32k.h"
-
-
-/*******************************************************************************
-*   Global Variables                                                           *
-*******************************************************************************/
-extern BOOL     fInited;
-extern HFILE    hWin32k;
-
+#include "libPrivate.h"
 
 
@@ -45 +38 @@
         ULONG         cbData = 0UL;
 
+        Param.hdr.cb = sizeof(Param);
+        Param.hdr.rc = ERROR_NOT_SUPPORTED;
         Param.ppv = ppv;
         Param.cb = cb;
         Param.flFlags = flag;
-        Param.rc = 0;
         Param.ulCS = libHelperGetCS();
         Param.ulEIP = *(PULONG)((int)(&ppv) - 4);
 
+        if (usCGSelector)
+            return libCallThruCallGate(K32_ALLOCMEMEX, &Param);
         rc = DosDevIOCtl(hWin32k,
                          IOCTL_W32K_K32,
@@ -58 +54 @@
                          "", 1, &cbData);
         if (rc == NO_ERROR)
-        {
-            rc = Param.rc;
-        }
+            rc = Param.hdr.rc;
     }
     else