Changeset 7118 for trunk/src

Timestamp:

Oct 19, 2001, 2:08:41 AM (24 years ago)

Author:

bird

Message:

New logging facility.

Location:

trunk/src/win32k/kKrnlLib

Files:

• Makefile (modified) (9 diffs)
• kKrnlLib.def (modified) (1 diff)
• kKrnlLibTst.def (modified) (2 diffs)

trunk/src/win32k/kKrnlLib/Makefile

@@ -1 @@
-# $Id: Makefile,v 1.14 2001-10-14 22:55:52 bird Exp $
+# $Id: Makefile,v 1.15 2001-10-19 00:08:40 bird Exp $
 
 #
@@ -61 +61 @@
     $(WIN32KOBJ)\kAVLStrI.obj \
     $(WIN32KOBJ)\kAVLULM.obj \
+    $(WIN32KOBJ)\kLog.obj \
+    $(WIN32KOBJ)\kLoga.obj \
     $(WIN32KOBJ)\malloc.obj \
     $(WIN32KOBJ)\smalloc.obj \
@@ -126 +128 @@
 $(OBJS:  =^
 )
-/IG
 $(LIBS:  =^
 )
@@ -169 +170 @@
     $(WIN32KOBJ)\kAVLStrI.obj \
     $(WIN32KOBJ)\kAVLULM.obj \
+    $(WIN32KOBJ)\kLog.obj \
+    $(WIN32KOBJ)\kLoga.obj \
     $(WIN32KOBJ)\malloc.obj_tst. \
     $(WIN32KOBJ)\smalloc.obj \
@@ -229 +232 @@
 $(TSTOBJS:  =^
 )
-/IG
 $(TSTLIBS:  =^
 )
@@ -270 +272 @@
 
 # List of object files in the converted devhelp library.
-DHLPOBJS =  +$(WIN32KOBJ)\dhcall5b.obj +$(WIN32KOBJ)\dhcal11a.obj \
-            +$(WIN32KOBJ)\dhcal11g.obj +$(WIN32KOBJ)\dhret.obj \
-            +$(WIN32KOBJ)\dhcall2e.obj
+DHLPOBJS =  +$(WIN32KOBJ)\..\dhcall5b.obj +$(WIN32KOBJ)\..\dhcal11a.obj \
+            +$(WIN32KOBJ)\..\dhcal11g.obj +$(WIN32KOBJ)\..\dhret.obj \
+            +$(WIN32KOBJ)\..\dhcall2e.obj
 
 # Make corrected devhelp library with only the required object files.
-$(WIN32KOBJ)\devhelp.lib: $(DDKPATH)\lib\dhcalls.lib $(WIN32KBIN)\libconv.exe $(DHLPOBJS:+=)
+$(WIN32KOBJ)\devhelp.lib: $(DDKPATH)\lib\dhcalls.lib $(DHLPOBJS:+=)
     @$(RM) $@
     @cd $(WIN32KOBJ)
@@ -282 +284 @@
 
 # Convert devhelp library.
-$(WIN32KOBJ)\devhelp_.lib: $(DDKPATH)\lib\dhcalls.lib
-    $(WIN32KBIN)\libconv $** $@
+devhelp_.lib: $(WIN32KOBJ)\..\devhelp_.lib
+$(WIN32KOBJ)\..\devhelp_.lib: $(WIN32KBIN)\libconv.exe $(DDKPATH)\lib\dhcalls.lib
+    $** $@
 
 # Extract required object files from the converted devhelp library.
-$(DHLPOBJS:+=): $(WIN32KOBJ)\devhelp_.lib
-    @cd $(WIN32KOBJ)
-    $(DDKPATH)\tools\lib /nologo $** *$@;
-    @cd $(MAKEDIR)
+$(DHLPOBJS:+=): $(WIN32KOBJ)\..\devhelp_.lib
+    $(ILIB) $** *$@;
 
 
@@ -301 +302 @@
 
 # Make corrected crt library with only the required object files.
-$(WIN32KOBJ)\clib.lib: $(MSCPATH)\lib\clibcep.lib $(WIN32KBIN)\libconv.exe $(CLIBOBJS:+=)
+$(WIN32KOBJ)\clib.lib: $(MSCPATH)\lib\clibcep.lib $(CLIBOBJS:+=)
     @$(RM) $@
     @cd $(WIN32KOBJ)
@@ -310 +311 @@
 
 # Convert devhelp library.
-$(WIN32KOBJ)\clib_.lib: $(MSCPATH)\lib\clibcep.lib
-    $(WIN32KBIN)\libconv $** $@ > nul
+$(WIN32KOBJ)\..\clib_.lib: $(WIN32KBIN)\libconv.exe $(MSCPATH)\lib\clibcep.lib
+    $** $@ > nul
 
 # Extract required object files from the converted crt library.
-$(CLIBOBJS:+=): $(WIN32KOBJ)\clib_.lib
-    @cd $(WIN32KOBJ)
+$(CLIBOBJS:+=): $(WIN32KOBJ)\..\clib_.lib
     $(ILIB) $** *$@;
-    @cd $(MAKEDIR)
 
 

trunk/src/win32k/kKrnlLib/kKrnlLib.def

@@ -32 +32 @@
 
     CALLTAB16           class 'CALLTAB16_DATA'
+    LOGDATA_16BIT       class 'LOGDATA_16BIT'
 

trunk/src/win32k/kKrnlLib/kKrnlLibTst.def

@@ -1 @@
-;/* $Id: kKrnlLibTst.def,v 1.3 2001-09-26 03:59:32 bird Exp $
+;/* $Id: kKrnlLibTst.def,v 1.4 2001-10-19 00:08:41 bird Exp $
 ; *
 ; * Definition file for the Ring-3 test program.
@@ -44 +44 @@
     CALLTAB16           class 'CALLTAB16_DATA'
 
+    LOGDATA_16BIT       class 'LOGDATA_16BIT'
+
+
 IMPORTS
      DosQuerySysState = DOSCALL1.368