Changeset 6747 for trunk/src

Timestamp:

Sep 18, 2001, 6:33:01 AM (24 years ago)

Author:

bird

Message:

New Org* ordinal scheme. Fixed some init bugs as well.

Location:

trunk/src/win32k/kKrnlLib

Files:

• Makefile (modified) (8 diffs)
• include/probkrnl.h (modified) (2 diffs)

trunk/src/win32k/kKrnlLib/Makefile

@@ -1 @@
-# $Id: Makefile,v 1.8 2001-09-17 02:27:54 bird Exp $
+# $Id: Makefile,v 1.9 2001-09-18 04:33:00 bird Exp $
 
 #
@@ -74 +74 @@
     $(WIN32KOBJ)\devlast.obj
 
+LASTLIB = $(WIN32KOBJ)\lastlib.lib
+
 LIBS =\
     $(VACPATH)\lib\$(RTLLIB_NRE) \
@@ -91 +93 @@
                             $(LIBS) \
                             $(WIN32KOBJ)\$(NAME)bldlevel.def \
-                            $(LASTOBJ) \
+                            $(LASTLIB) \
                             $(LIBSINIT) \
                             $(WIN32KOBJ)\$(@B).lnk \
@@ -122 +124 @@
 $(LIBS:  =^
 )
-$(LASTOBJ)
+$(LASTLIB)
 $(WIN32KOBJ)\$(NAME)bldlevel.def
 <<KEEP
@@ -132 +134 @@
         -V"#define=ODIN32_VERSION,$(ODIN32_INCLUDE)\odinbuild.h" \
         -M"#define=ODIN32_BUILD_NR,$(ODIN32_INCLUDE)\odinbuild.h"
+
+# Last lib - needed to get LASTOBJ in after the importlibraries.
+$(LASTLIB): $(LASTOBJ)
+    -@$(RM) $@ > nul 2> nul
+    $(ILIB) $@ $**;
 
 
@@ -184 +191 @@
 TSTLASTOBJ = $(LASTOBJ)
 
+TSTLASTLIB = $(WIN32KOBJ)\tstlastlib.lib
+
 TSTLIBS = $(LIBS)
 
@@ -199 +208 @@
                                 $(TSTOBJS:. = ) \
                                 $(TSTLIBS) \
-                                $(TSTLASTOBJ) \
+                                $(TSTLASTLIB) \
                                 $(WIN32KOBJ)\$(@B).lnk \
                                 Makefile makefile.inc ..\..\..\makefile.inc
@@ -220 +229 @@
 $(TSTLIBS:  =^
 )
-$(TSTLASTOBJ)
+$(TSTLASTLIB)
 $(NAME)tst.def
 <<KEEP
 
+# Last lib - needed to get LASTOBJ in after the importlibraries.
+$(TSTLASTLIB): $(TSTLASTOBJ)
+    -@$(RM) $@ > nul 2> nul
+    $(ILIB) $@ $**;
 
 

trunk/src/win32k/kKrnlLib/include/probkrnl.h

@@ -1 @@
-/* $Id: probkrnl.h,v 1.3 2001-09-17 00:11:36 bird Exp $
+/* $Id: probkrnl.h,v 1.4 2001-09-18 04:33:01 bird Exp $
  *
  * Include file for ProbKrnl.
@@ -100 +100 @@
 #define EXP_VAR16       7
 #define EXP_PROC16      8
+#define EXP_ORGPROC32   9
+#define EXP_ORGPROC16   10