Changeset 4164 for trunk/src/win32k/lib

Timestamp:

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

Author:

bird

Message:

Merged in the Grace branch. New Win32k!

Location:

trunk/src/win32k/lib

Files:

• libDosAllocMemEx.c (modified) (2 diffs)
• libTest.c (modified) (2 diffs)
• libW32kQueryOTEs.c (added)
• libWin32kInstalled.c (added)
• libWin32kQueryOptionsStatus.c (added)
• libWin32kSetOptions.c (added)
• makefile (modified) (3 diffs)

trunk/src/win32k/lib/libDosAllocMemEx.c

@@ -1 @@
-/* $Id: libDosAllocMemEx.c,v 1.3 2000-02-26 19:59:55 bird Exp $
+/* $Id: libDosAllocMemEx.c,v 1.4 2000-09-02 21:08:11 bird Exp $
  *
  * DosAllocMemEx - Extened Edition of DosAllocMem.
@@ -17 +17 @@
 #define INCL_DOSFILEMGR
 #define INCL_DOSDEVICES
-#define INCL_WIN32K_LIB
 
 

trunk/src/win32k/lib/libTest.c

@@ -1 @@
-/* $Id: libTest.c,v 1.1 2000-02-26 20:19:26 bird Exp $
+/* $Id: libTest.c,v 1.2 2000-09-02 21:08:11 bird Exp $
  *
  * Test program for the win32k library.
@@ -12 +12 @@
 *   Defined Constants And Macros                                               *
 *******************************************************************************/
-#define INCL_WIN32K_LIB
 #define INCL_BASE
 

trunk/src/win32k/lib/makefile

@@ -1 +1 @@
 ##############################################################################
-# $Id: makefile,v 1.3 2000-03-17 17:38:27 bird Exp $
+# $Id: makefile,v 1.4 2000-09-02 21:08:12 bird Exp $
 #
 # PD-Win32 API
@@ -49 +49 @@
 OBJS     =  $(WIN32KOBJ)\libInit.$(OBJEXT)         \
             $(WIN32KOBJ)\libTerm.$(OBJEXT)     \
+            $(WIN32KOBJ)\libWin32kInstalled.$(OBJEXT) \
+            $(WIN32KOBJ)\libWin32kQueryOptionsStatus.$(OBJEXT) \
+            $(WIN32KOBJ)\libWin32kSetOptions.$(OBJEXT) \
             $(WIN32KOBJ)\libDosAllocMemEx.$(OBJEXT) \
+            $(WIN32KOBJ)\libW32kQueryOTEs.$(OBJEXT) \
             $(WIN32KOBJ)\libGetCS.obj
 
@@ -86 +90 @@
 ##############################################################################
 dep:
-    $(DEPEND) -obj$(OBJEXT) -o$(WIN32KOBJ) $(CINCLUDES) $(WIN32KBASE)\include\*.h
+    $(DEPEND) -obj$(OBJEXT) -o$(WIN32KOBJ) $(CINCLUDES) \
+        $(WIN32KBASE)\include\*.h *.c* *.asm
 
 !if [$(EXISTS) .depend] == 0