Index: trunk/src/win32k/kKrnlLib/include/kAVL.h
===================================================================
--- trunk/src/win32k/kKrnlLib/include/kAVL.h	(revision 8070)
+++ 	(revision )
@@ -1,295 +1,0 @@
-/* $Id: kAVL.h,v 1.3 2001-09-27 03:05:58 bird Exp $
- *
- * kAVL - header file for all the AVL trees.
- *
- * Copyright (c) 1999-2001 knut st. osmundsen (kosmunds@csc.com)
- *
- */
-#ifndef _kAVL_h_
-#define _kAVL_h_
-
-
-/*******************************************************************************
-*   AVL tree of unique case-sensitive strings.                                 *
-*******************************************************************************/
-#define KAVLSTR_MAX_HEIGHT  26
-/**
- * AVL key type
- */
-typedef const char *AVLSTRKEY;
-
-/**
- * AVL Core node.
- */
-typedef struct _AVLStrNodeCore
-{
-    AVLSTRKEY                Key;       /* Key value. */
-    struct  _AVLStrNodeCore *pLeft;     /* Pointer to left leaf node. */
-    struct  _AVLStrNodeCore *pRight;    /* Pointer to right leaf node. */
-    unsigned char           uchHeight;  /* Height of this tree: max(heigth(left), heigth(right)) + 1 */
-} AVLSTRNODECORE, *PAVLSTRNODECORE, **PPAVLSTRNODECORE;
-
-
-/**
- * AVL Enum data - All members are PRIVATE! Don't touch!
- */
-typedef struct _AVLStrEnumData
-{
-    char            fFromLeft;
-    char            cEntries;
-    char            achFlags[KAVLSTR_MAX_HEIGHT];
-    PAVLSTRNODECORE aEntries[KAVLSTR_MAX_HEIGHT];
-} AVLSTRENUMDATA, *PAVLSTRENUMDATA;
-
-/*
- * callback type
- */
-typedef unsigned ( _PAVLSTRCALLBACK)(PAVLSTRNODECORE, void*);
-typedef _PAVLSTRCALLBACK *PAVLSTRCALLBACK;
-
-
-/*
- * Functions.
- */
-PAVLSTRNODECORE     KLIBCALL AVLStrRemove(PPAVLSTRNODECORE ppTree, AVLSTRKEY Key);
-KBOOL               KLIBCALL AVLStrInsert(PPAVLSTRNODECORE ppTree, PAVLSTRNODECORE pNode);
-PAVLSTRNODECORE     KLIBCALL AVLStrGet(PPAVLSTRNODECORE ppTree, AVLSTRKEY Key);
-PAVLSTRNODECORE     KLIBCALL AVLStrBeginEnumTree(PPAVLSTRNODECORE ppTree, PAVLSTRENUMDATA pEnumData, int fFromLeft);
-PAVLSTRNODECORE     KLIBCALL AVLStrGetNextNode(PAVLSTRENUMDATA pEnumData);
-unsigned            KLIBCALL AVLStrDoWithAll(PPAVLSTRNODECORE ppTree, int fFromLeft, PAVLSTRCALLBACK pfnCallBack, void *pvParam);
-
-
-
-/*******************************************************************************
-*   AVL tree of unique case-insensitive strings.                               *
-*******************************************************************************/
-#define KAVLSTRI_MAX_HEIGHT  26
-/**
- * AVL key type
- */
-typedef const char *AVLSTRIKEY;
-
-/**
- * AVL Core node.
- */
-typedef struct _AVLStrINodeCore
-{
-    AVLSTRIKEY               Key;       /* Key value. */
-    struct  _AVLStrINodeCore *pLeft;    /* Pointer to left leaf node. */
-    struct  _AVLStrINodeCore *pRight;   /* Pointer to right leaf node. */
-    unsigned char           uchHeight;  /* Height of this tree: max(heigth(left), heigth(right)) + 1 */
-} AVLSTRINODECORE, *PAVLSTRINODECORE, **PPAVLSTRINODECORE;
-
-
-/**
- * AVL Enum data - All members are PRIVATE! Don't touch!
- */
-typedef struct _AVLStrIEnumData
-{
-    char                fFromLeft;
-    char                cEntries;
-    char                achFlags[KAVLSTRI_MAX_HEIGHT];
-    PAVLSTRINODECORE    aEntries[KAVLSTRI_MAX_HEIGHT];
-} AVLSTRIENUMDATA, *PAVLSTRIENUMDATA;
-
-/*
- * callback type
- */
-typedef unsigned ( _PAVLSTRICALLBACK)(PAVLSTRINODECORE, void*);
-typedef _PAVLSTRICALLBACK *PAVLSTRICALLBACK;
-
-
-/*
- * Functions.
- */
-PAVLSTRINODECORE    KLIBCALL AVLStrIRemove(PPAVLSTRINODECORE ppTree, AVLSTRIKEY Key);
-KBOOL               KLIBCALL AVLStrIInsert(PPAVLSTRINODECORE ppTree, PAVLSTRINODECORE pNode);
-PAVLSTRINODECORE    KLIBCALL AVLStrIGet(PPAVLSTRINODECORE ppTree, AVLSTRIKEY Key);
-PAVLSTRINODECORE    KLIBCALL AVLStrIBeginEnumTree(PPAVLSTRINODECORE ppTree, PAVLSTRIENUMDATA pEnumData, int fFromLeft);
-PAVLSTRINODECORE    KLIBCALL AVLStrIGetNextNode(PAVLSTRIENUMDATA pEnumData);
-unsigned            KLIBCALL AVLStrIDoWithAll(PPAVLSTRINODECORE ppTree, int fFromLeft, PAVLSTRICALLBACK pfnCallBack, void *pvParam);
-
-
-
-/*******************************************************************************
-*   AVL tree of void pointers.                                                 *
-*******************************************************************************/
-#define KAVLPV_MAX_HEIGHT  26
-/**
- * AVL key type
- */
-typedef void *AVLPVKEY;
-
-/**
- * AVL Core node.
- */
-typedef struct _AVLPVNodeCore
-{
-    AVLPVKEY                Key;        /* Key value. */
-    struct  _AVLPVNodeCore *pLeft;      /* Pointer to left leaf node. */
-    struct  _AVLPVNodeCore *pRight;     /* Pointer to right leaf node. */
-    unsigned char           uchHeight;  /* Height of this tree: max(heigth(left), heigth(right)) + 1 */
-} AVLPVNODECORE, *PAVLPVNODECORE, **PPAVLPVNODECORE;
-
-
-/**
- * AVL Enum data - All members are PRIVATE! Don't touch!
- */
-typedef struct _AVLPVEnumData
-{
-    char                fFromLeft;
-    char                cEntries;
-    char                achFlags[KAVLPV_MAX_HEIGHT];
-    PAVLPVNODECORE      aEntries[KAVLPV_MAX_HEIGHT];
-} AVLPVENUMDATA, *PAVLPVENUMDATA;
-
-/*
- * callback type
- */
-typedef unsigned ( _PAVLPVCALLBACK)(PAVLPVNODECORE, void*);
-typedef _PAVLPVCALLBACK *PAVLPVCALLBACK;
-
-
-/*
- * Functions.
- */
-PAVLPVNODECORE      KLIBCALL AVLPVRemove(PPAVLPVNODECORE ppTree, AVLPVKEY Key);
-KBOOL               KLIBCALL AVLPVInsert(PPAVLPVNODECORE ppTree, PAVLPVNODECORE pNode);
-PAVLPVNODECORE      KLIBCALL AVLPVGet(PPAVLPVNODECORE ppTree, AVLPVKEY Key);
-PAVLPVNODECORE      KLIBCALL AVLPVGetWithParent(PPAVLPVNODECORE ppTree, PPAVLPVNODECORE ppParent, AVLPVKEY Key);
-PAVLPVNODECORE      KLIBCALL AVLPVGetWithAdjacentNodes(PPAVLPVNODECORE ppTree, AVLPVKEY Key, PPAVLPVNODECORE ppLeft, PPAVLPVNODECORE ppRight);
-PAVLPVNODECORE      KLIBCALL AVLPVGetBestFit(PPAVLPVNODECORE ppTree, AVLPVKEY Key, KBOOL fAbove);
-PAVLPVNODECORE      KLIBCALL AVLPVRemoveBestFit(PPAVLPVNODECORE ppTree, AVLPVKEY Key, KBOOL fAbove);
-PAVLPVNODECORE      KLIBCALL AVLPVBeginEnumTree(PPAVLPVNODECORE ppTree, PAVLPVENUMDATA pEnumData, int fFromLeft);
-PAVLPVNODECORE      KLIBCALL AVLPVGetNextNode(PAVLPVENUMDATA pEnumData);
-unsigned            KLIBCALL AVLPVDoWithAll(PPAVLPVNODECORE ppTree, int fFromLeft, PAVLPVCALLBACK pfnCallBack, void *pvParam);
-
-
-/*******************************************************************************
-*   AVL tree of unsigned long.                                                 *
-*******************************************************************************/
-#define KAVLUL_MAX_HEIGHT  26
-/**
- * AVL key type
- */
-typedef unsigned long AVLULKEY;
-
-/**
- * AVL Core node.
- */
-typedef struct _AVLULNodeCore
-{
-    AVLULKEY                Key;        /* Key value. */
-    struct  _AVLULNodeCore *pLeft;      /* Pointer to left leaf node. */
-    struct  _AVLULNodeCore *pRight;     /* Pointer to right leaf node. */
-    unsigned char           uchHeight;  /* Height of this tree: max(heigth(left), heigth(right)) + 1 */
-} AVLULNODECORE, *PAVLULNODECORE, **PPAVLULNODECORE;
-
-
-/**
- * AVL Enum data - All members are PRIVATE! Don't touch!
- */
-typedef struct _AVLULEnumData
-{
-    char                fFromLeft;
-    char                cEntries;
-    char                achFlags[KAVLUL_MAX_HEIGHT];
-    PAVLULNODECORE      aEntries[KAVLUL_MAX_HEIGHT];
-} AVLULENUMDATA, *PAVLULENUMDATA;
-
-/*
- * callback type
- */
-typedef unsigned ( _PAVLULCALLBACK)(PAVLULNODECORE, void*);
-typedef _PAVLULCALLBACK *PAVLULCALLBACK;
-
-
-/*
- * Functions.
- */
-PAVLULNODECORE      KLIBCALL AVLULRemove(PPAVLULNODECORE ppTree, AVLULKEY Key);
-KBOOL               KLIBCALL AVLULInsert(PPAVLULNODECORE ppTree, PAVLULNODECORE pNode);
-PAVLULNODECORE      KLIBCALL AVLULGet(PPAVLULNODECORE ppTree, AVLULKEY Key);
-PAVLULNODECORE      KLIBCALL AVLULGetWithParent(PPAVLULNODECORE ppTree, PPAVLULNODECORE ppParent, AVLULKEY Key);
-PAVLULNODECORE      KLIBCALL AVLULGetWithAdjacentNodes(PPAVLULNODECORE ppTree, AVLULKEY Key, PPAVLULNODECORE ppLeft, PPAVLULNODECORE ppRight);
-PAVLULNODECORE      KLIBCALL AVLULGetBestFit(PPAVLULNODECORE ppTree, AVLULKEY Key, KBOOL fAbove);
-PAVLULNODECORE      KLIBCALL AVLULRemoveBestFit(PPAVLULNODECORE ppTree, AVLULKEY Key, KBOOL fAbove);
-PAVLULNODECORE      KLIBCALL AVLULBeginEnumTree(PPAVLULNODECORE ppTree, PAVLULENUMDATA pEnumData, int fFromLeft);
-PAVLULNODECORE      KLIBCALL AVLULGetNextNode(PAVLULENUMDATA pEnumData);
-unsigned            KLIBCALL AVLULDoWithAll(PPAVLULNODECORE ppTree, int fFromLeft, PAVLULCALLBACK pfnCallBack, void *pvParam);
-
-/* since ULONG and PVOID is of the same size don't duplicated the code! */
-#if defined(__IBMC__) || defined(__IBMCPP__)
-    #pragma map(AVLULRemove               , "AVLPVRemove")
-    #pragma map(AVLULInsert               , "AVLPVInsert")
-    #pragma map(AVLULGet                  , "AVLPVGet")
-    #pragma map(AVLULGetWithParent        , "AVLPVGetWithParent")
-    #pragma map(AVLULGetWithAdjacentNodes , "AVLPVGetWithAdjacentNodes")
-    #pragma map(AVLULGetBestFit           , "AVLPVGetBestFit")
-    #pragma map(AVLULRemoveBestFit        , "AVLPVRemoveBestFit")
-    #pragma map(AVLULBeginEnumTree        , "AVLPVBeginEnumTree")
-    #pragma map(AVLULGetNextNode          , "AVLPVGetNextNode")
-    #pragma map(AVLULDoWithAll            , "AVLPVDoWithAll")
-#else
-    #error "Mapping not supported/implemented for this compiler."
-#endif
-
-
-/*******************************************************************************
-*   AVL tree of unsigned long.                                                 *
-*******************************************************************************/
-#define KAVLULM_MAX_HEIGHT  26
-/**
- * AVL key type
- */
-typedef unsigned long AVLULMKEY;
-
-/**
- * AVL Core node.
- */
-typedef struct _AVLULMNodeCore
-{
-    AVLULMKEY               Key;        /* Key value. */
-    struct  _AVLULMNodeCore *pLeft;     /* Pointer to left leaf node. */
-    struct  _AVLULMNodeCore *pRight;    /* Pointer to right leaf node. */
-    struct  _AVLULMNodeCore *pList;     /* Pointer to list of equal nodes. */
-    unsigned char           uchHeight;  /* Height of this tree: max(heigth(left), heigth(right)) + 1 */
-} AVLULMNODECORE, *PAVLULMNODECORE, **PPAVLULMNODECORE;
-
-
-/**
- * AVL Enum data - All members are PRIVATE! Don't touch!
- */
-typedef struct _AVLULMEnumData
-{
-    char                fFromLeft;
-    char                cEntries;
-    char                achFlags[KAVLULM_MAX_HEIGHT];
-    PAVLULMNODECORE     aEntries[KAVLULM_MAX_HEIGHT];
-} AVLULMENUMDATA, *PAVLULMENUMDATA;
-
-/*
- * callback type
- */
-typedef unsigned ( _PAVLULMCALLBACK)(PAVLULMNODECORE, void*);
-typedef _PAVLULMCALLBACK *PAVLULMCALLBACK;
-
-
-/*
- * Functions.
- */
-PAVLULMNODECORE     KLIBCALL AVLULMRemove(PPAVLULMNODECORE ppTree, AVLULMKEY Key);
-PAVLULMNODECORE     KLIBCALL AVLULMRemove2(PPAVLULMNODECORE ppTree, PAVLULMNODECORE pNode);
-KBOOL               KLIBCALL AVLULMInsert(PPAVLULMNODECORE ppTree, PAVLULMNODECORE pNode);
-PAVLULMNODECORE     KLIBCALL AVLULMGet(PPAVLULMNODECORE ppTree, AVLULMKEY Key);
-PAVLULMNODECORE     KLIBCALL AVLULMGet2(PPAVLULMNODECORE ppTree, PAVLULMNODECORE pNodeGet);
-PAVLULMNODECORE     KLIBCALL AVLULMGetWithParent(PPAVLULMNODECORE ppTree, PPAVLULMNODECORE ppParent, AVLULMKEY Key);
-PAVLULMNODECORE     KLIBCALL AVLULMGetWithAdjacentNodes(PPAVLULMNODECORE ppTree, AVLULMKEY Key, PPAVLULMNODECORE ppLeft, PPAVLULMNODECORE ppRight);
-PAVLULMNODECORE     KLIBCALL AVLULMGetBestFit(PPAVLULMNODECORE ppTree, AVLULMKEY Key, KBOOL fAbove);
-PAVLULMNODECORE     KLIBCALL AVLULMRemoveBestFit(PPAVLULMNODECORE ppTree, AVLULMKEY Key, KBOOL fAbove);
-PAVLULMNODECORE     KLIBCALL AVLULMBeginEnumTree(PPAVLULMNODECORE ppTree, PAVLULMENUMDATA pEnumData, int fFromLeft);
-PAVLULMNODECORE     KLIBCALL AVLULMGetNextNode(PAVLULMENUMDATA pEnumData);
-unsigned            KLIBCALL AVLULMDoWithAll(PPAVLULMNODECORE ppTree, int fFromLeft, PAVLULMCALLBACK pfnCallBack, void *pvParam);
-
-
-#endif
Index: trunk/src/win32k/kKrnlLib/include/kAssert.h
===================================================================
--- trunk/src/win32k/kKrnlLib/include/kAssert.h	(revision 8070)
+++ 	(revision )
@@ -1,18 +1,0 @@
-/* $Id: kAssert.h,v 1.2 2001-12-14 21:36:31 bird Exp $
- *
- * kAssert - assert macro(s).
- * This file is DEAD now - use kTypes.h instead.
- *
- * Copyright (c) 1999-2001 knut st. osmundsen (knut.stange.osmundsen@mynd.no)
- *
- */
-#ifndef _kAssert_h_
-#define _kAssert_h_
-
-#ifndef _kTypes_h_
-#include <kTypes.h>
-#endif
-
-#endif /* _kAssert_h_ */
-
-
Index: trunk/src/win32k/kKrnlLib/include/kLog.h
===================================================================
--- trunk/src/win32k/kKrnlLib/include/kLog.h	(revision 8070)
+++ 	(revision )
@@ -1,372 +1,0 @@
-/* $Id: kLog.h,v 1.11 2002-01-09 03:21:59 bird Exp $
- *
- * kLog - Generic Logging and Trace Routines.
- *
- * Copyright (c) 2001 knut st. osmundsen (knut.stange.osmundsen@mynd.no)
- *
- */
-
-#ifndef _kLog_h_
-#define _kLog_h_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*******************************************************************************
-*   Defined Constants And Macros                                               *
-*******************************************************************************/
-/*
- * Standard log types.
- */
-#define KLOG_TYPE_LOGINIT    0          /* Log Initiated. */
-#define KLOG_TYPE_INITMOD    1          /* Log Module Init. */
-#define KLOG_TYPE_TERMMOD    2          /* Log Module Termination. */
-#define KLOG_TYPE_START      3          /* Start sequence and function entry. */
-#define KLOG_TYPE_ENTRY      4          /* Function entry. */
-#define KLOG_TYPE_EXIT       5          /* Function exit. */
-#define KLOG_TYPE_STOP       6          /* Stop sequence and function exit.  */
-#define KLOG_TYPE_PRINTF     7          /* kprintf and printf log output. */
-#define KLOG_TYPE_ASSERT     8          /* Assertion failed / Kernel Panic. */
-#define KLOG_TYPE_LOGASSERT  9          /* Assertion failed within kLog. */
-
-#define KLOG_TYPE_LAST_REQ   KLOG_TYPE_ASSERT   /* Last required type. */
-
-#define KLOG_TYPE_USER       0x1000     /* First user log type.  */
-
-
-/*
- * Flags.
- */
-#define KLOG_TYPEDEF_PTR        0x8000  /* flags this typedef as a pointer. */
-#define KLOG_TYPEDEF_ARRAY      0x4000  /* flags this typedef as an array. */
-#define KLOG_TYPEDEF_SIZE       0x0fff  /* Mask to get the size. */
-
-#define KLOG_FLAGS_DISABLED     0x0000
-#define KLOG_FLAGS_ENABLED      0x0001
-#ifdef RING0
-#define KLOG_FLAGS_COMOUTPUT    0x0010
-#else
-#define KLOG_FLAGS_COMOUTPUT    0x0000
-#endif
-#define KLOG_FLAGS_MASK         0x0011
-#define KLOG_FLAGS_AS_ABOVE     0xffff  /* Inherit options from above option level. */
-
-/*
- * Define defaults.
- */
-#ifndef KLOGFILEDEF
-    #define KLOGFILEDEF     __FILE__
-#endif
-#ifndef KLOGFUNCTIONDEF
-    #define KLOGFUNCTIONDEF __FUNCTION__
-#endif
-
-#ifndef KLOGFILE
-    #ifndef NOFILEID
-        #define KLOGFILE    szFileId
-    #else
-        #define KLOGFILE    KLOGFUNCTIONDEF
-    #endif
-#endif
-#ifndef KLOGFUNCTION
-    #define KLOGFUNCTION    szkLogFunctionName
-#endif
-#ifndef KLOGRETURNTYPE
-    #define KLOGRETURNTYPE  szkLogReturnType
-#endif
-#ifndef KLOGMODHANDLE
-    #define KLOGMODHANDLE   hkLogMod
-#endif
-#ifndef KLOGSEQHANDLE
-    #define KLOGSEQHANDLE   kLogSeqHandle
-#endif
-
-/*
- * Position parameters.
- */
-#define KLOGPOS_EXT         KLOGFILE, __LINE__, KLOGFUNCTION    /* external call */
-#define KLOGPOS_INT         pszFile, iLine, pszFunction         /* Internal call */
-#define KLOGPOS_DECL        const char *pszFile, int iLine, const char *pszFunction
-
-
-/*
- * RAS Data.
- */
-#define KLOG_MAJOR          253
-#define KLOG_MINOR          42
-
-
-/*******************************************************************************
-*   Structures and Typedefs                                                    *
-*******************************************************************************/
-#pragma pack(1)
-typedef unsigned long int  HKLOGMOD;    /* Loghandle for a module. */
-
-#ifdef _kAVL_h_
-
-/**
- * Describes one struct member.
- */
-typedef struct kLogMemberInfo
-{
-    const char *    pszName;
-    const char *    pszFormat;
-    const short     cb;
-    const short     offset;
-} KLOGMEMBERINFO, *PKLOGMEMBERINFO;
-
-
-/**
- * Describes one user typedef.
- */
-typedef struct kLogTypedefInfo
-{
-    union
-    {
-        const char *        pszType;
-        AVLSTRNODECORE      avlnodecore;
-    } u1;
-    const char *            pszFormat;
-    const unsigned short    cb;
-    const unsigned short    cMembers;
-    const PKLOGMEMBERINFO
-                    paMembers;
-} KLOGTYPEDEFINFO, *PKLOGTYPEDEFINFO;
-
-
-/**
- * Describes one user log/trace type.
- */
-typedef struct kLogTypeInfo
-{
-    const char *            pszType;
-    const char *            pszFormat;
-    unsigned short          fCurrent;
-    const unsigned short    fDefault;
-} KLOGTYPEINFO, *PKLOGTYPEINFO;
-
-
-/**
- * Holds stateinfo on one default log/trace type.
- */
-typedef struct kLogDefTypeInfo
-{
-    unsigned short          fCurrent;
-    const unsigned short    fDefault;
-} KLOGDEFTYPEINFO, *PKLOGDEFTYPEINFO;
-
-
-/**
- * Describes one file.
- */
-typedef struct kLogFileInfo
-{
-    union
-    {
-        const char *        pszFile;
-        AVLSTRNODECORE      avlnodecore;
-    } u1;
-    unsigned short          fCurrent;
-    const unsigned short    fDefault;
-} KLOGFILEINFO, *PKLOGFILEINFO;
-
-
-
-/**
- * Log Module Data.
- */
-typedef struct kLogModuleData
-{
-    const char *    pszModuleName;      /* Module name. */
-    const char *    pszModuleDescription;/*Module description. */
-
-    int                     cTypedefs;  /* Number of typesdef in paTypedefs. */
-    PKLOGTYPEDEFINFO        paTypedefs; /* Array of typedef descriptions. */
-
-    int                     cUserTypes; /* Number of user types in paUserTypes. */
-    PKLOGTYPEINFO           paUserTypes;/* Array of user type descriptions. */
-
-    int                     cDefTypes;  /* Number of default types in paDefTypes. */
-    PKLOGDEFTYPEINFO        paDefTypes; /* Array of default type descriptions. */
-
-    int                     cFiles;     /* Number of files in paFiles. */
-    PKLOGFILEINFO           paFiles;    /* Array of per file settings. */
-
-    unsigned short          fCurrent;
-    const unsigned short    fDefault;
-
-    /* Module Data Used by Log System - Do NOT touch! */
-    AVLULNODECORE           avlnodecore;/* AVL Tree node with module handle as key. */
-    PAVLSTRNODECORE         pavlTypedefs;/*Tree of typedef into entries. */
-    PAVLSTRNODECORE         pavlFiles;  /* Tree of file into entries. */
-    unsigned long           ulLastSeq;  /* Last sequence number. */
-
-} KLOGMODDATA, *PKLOGMODDATA;
-#endif /* #ifdef _kAVL_h_ */
-
-
-/**
- * The sequence handle on the stack.
- */
-typedef union kLogSeqHandle
-{
-    char    achMagic[16];
-    struct kLogSeqHandleData
-    {
-        unsigned long   ulMagic;
-        unsigned long   ulSeq;
-    } data;
-} HKLOGSEQ, *PHKLOGSEQ;
-
-#pragma pack()
-
-/*******************************************************************************
-*   Functions                                                                  *
-*******************************************************************************/
-int         KLIBCALL kLogInit(unsigned long cbBufferSize);
-int         KLIBCALL kLogInitBuffer(unsigned long cbBufferSize);
-
-#ifdef _kAVL_h_
-HKLOGMOD    KLIBCALL kLogInitMod(PKLOGMODDATA pMod, KLOGPOS_DECL);
-#endif
-void        KLIBCALL kLogTermMod(HKLOGMOD hLogMod, KLOGPOS_DECL);
-
-int         KLIBCALL kLogStart(HKLOGMOD hLogMod, KLOGPOS_DECL, PHKLOGSEQ phSeq, const char *pszFuncProto, KBOOL fOptlink, ...);
-int         KLIBCALL kLogEntry(HKLOGMOD hLogMod, KLOGPOS_DECL, const char *pszFuncProto, KBOOL fOptlink, ...);
-void        KLIBCALL kLogExit(HKLOGMOD hLogMod, KLOGPOS_DECL, const char *pszReturnType, ...);
-void        KLIBCALL kLogStop(HKLOGMOD hLogMod, KLOGPOS_DECL, PHKLOGSEQ phSeq, const char *pszReturnType, ...);
-
-void        KLIBCALL kLog(HKLOGMOD hLogMod, KLOGPOS_DECL, int iType, ...);
-#if defined(va_arg) || defined(va_list) || defined(va_start) || defined(va_end)
-void        KLIBCALL kLogv(HKLOGMOD hLogMod, KLOGPOS_DECL, int iType, va_list args);
-#endif
-
-int         KLIBCALL kLogFixPrintf1(const char *pszFormat, ...);
-void        KLIBCALL kLogFixPrintf2(HKLOGMOD hLogMod, KLOGPOS_DECL, int iType, int iBuffer);
-
-
-
-/*******************************************************************************
-*   Macros                                                                     *
-*******************************************************************************/
-#if (defined(DEBUG) || defined(LOGGING_ENABLED)) && !defined(LOGGING_DISABLED)
-    #define KLOGINITMOD(pMod)                                           KLOGMODHANDLE = kLogInitMod(pMod, KLOGPOS_EXT)
-    #define KLOGTERMMOD()                                               kLogTermMod(KLOGMODHANDLE, KLOGPOS_EXT)
-
-    #define KLOGSTARTPARMS                                              KLOGMODHANDLE, KLOGPOS_EXT, SSToDS(&KLOGSEQHANDLE)
-    #define KLOGENTRYPARMS                                              KLOGMODHANDLE, KLOGPOS_EXT
-    #define KLOGSTARTVARS(pszRetType)                                   static const char   KLOGFUNCTION[] = KLOGFUNCTIONDEF; \
-                                                                        static const char   KLOGRETURNTYPE[] = pszRetType; \
-                                                                        HKLOGSEQ            KLOGSEQHANDLE; \
-                                                                        int                 kLogDummyVariable
-    #define KLOGENTRYVARS(pszRetType)                                   static const char   KLOGFUNCTION[] = KLOGFUNCTIONDEF; \
-                                                                        static const char   KLOGRETURNTYPE[] = pszRetType; \
-                                                                        int                 kLogDummyVariable
-
-    #define KLOGSTART( pszRetType, pszProto, arg0)                      KLOGSTARTVARS(pszRetType) = kLogStart(KLOGSTARTPARMS, pszProto, FALSE, &(arg0))
-    #define KLOGSTART0(pszRetType)                                      KLOGSTARTVARS(pszRetType) = kLogStart(KLOGSTARTPARMS, NULL, TRUE)
-    #define KLOGSTART1(pszRetType, pszProto, a0)                        KLOGSTARTVARS(pszRetType) = kLogStart(KLOGSTARTPARMS, pszProto, TRUE,a0)
-    #define KLOGSTART2(pszRetType, pszProto, a0,a1)                     KLOGSTARTVARS(pszRetType) = kLogStart(KLOGSTARTPARMS, pszProto, TRUE,a0,a1)
-    #define KLOGSTART3(pszRetType, pszProto, a0,a1,a2)                  KLOGSTARTVARS(pszRetType) = kLogStart(KLOGSTARTPARMS, pszProto, TRUE,a0,a1,a2)
-    #define KLOGSTART4(pszRetType, pszProto, a0,a1,a2,a3)               KLOGSTARTVARS(pszRetType) = kLogStart(KLOGSTARTPARMS, pszProto, TRUE,a0,a1,a2,a3)
-    #define KLOGSTART5(pszRetType, pszProto, a0,a1,a2,a3,a4)            KLOGSTARTVARS(pszRetType) = kLogStart(KLOGSTARTPARMS, pszProto, TRUE,a0,a1,a2,a2,a4)
-    #define KLOGSTART6(pszRetType, pszProto, a0,a1,a2,a3,a4,a5)         KLOGSTARTVARS(pszRetType) = kLogStart(KLOGSTARTPARMS, pszProto, TRUE,a0,a1,a2,a2,a4,a5)
-    #define KLOGSTART7(pszRetType, pszProto, a0,a1,a2,a3,a4,a5,a6)      KLOGSTARTVARS(pszRetType) = kLogStart(KLOGSTARTPARMS, pszProto, TRUE,a0,a1,a2,a2,a4,a5,a6)
-    #define KLOGSTART8(pszRetType, pszProto, a0,a1,a2,a3,a4,a5,a6,a7)   KLOGSTARTVARS(pszRetType) = kLogStart(KLOGSTARTPARMS, pszProto, TRUE,a0,a1,a2,a2,a4,a5,a6,a7)
-    #define KLOGSTART9(pszRetType, pszProto, a0,a1,a2,a3,a4,a5,a6,a7,a8)            KLOGSTARTVARS(pszRetType) = kLogStart(KLOGSTARTPARMS, pszProto, TRUE,a0,a1,a2,a2,a4,a5,a6,a7,a8)
-    #define KLOGSTART10(pszRetType, pszProto, a0,a1,a2,a3,a4,a5,a6,a7,a8,a9)        KLOGSTARTVARS(pszRetType) = kLogStart(KLOGSTARTPARMS, pszProto, TRUE,a0,a1,a2,a2,a4,a5,a6,a7,a8,a9)
-    #define KLOGSTART11(pszRetType, pszProto, a0,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10)    KLOGSTARTVARS(pszRetType) = kLogStart(KLOGSTARTPARMS, pszProto, TRUE,a0,a1,a2,a2,a4,a5,a6,a7,a8,a9,a10)
-
-    #define KLOGENTRY( pszRetType, pszProto, arg0)                      KLOGENTRYVARS(pszRetType) = kLogEntry(KLOGENTRYPARMS, pszProto, FALSE, &(arg0))
-    #define KLOGENTRY0(pszRetType)                                      KLOGENTRYVARS(pszRetType) = kLogEntry(KLOGENTRYPARMS, NULL, TRUE)
-    #define KLOGENTRY1(pszRetType, pszProto, a0)                        KLOGENTRYVARS(pszRetType) = kLogEntry(KLOGENTRYPARMS, pszProto, TRUE,a0)
-    #define KLOGENTRY2(pszRetType, pszProto, a0,a1)                     KLOGENTRYVARS(pszRetType) = kLogEntry(KLOGENTRYPARMS, pszProto, TRUE,a0,a1)
-    #define KLOGENTRY3(pszRetType, pszProto, a0,a1,a2)                  KLOGENTRYVARS(pszRetType) = kLogEntry(KLOGENTRYPARMS, pszProto, TRUE,a0,a1,a2)
-    #define KLOGENTRY4(pszRetType, pszProto, a0,a1,a2,a3)               KLOGENTRYVARS(pszRetType) = kLogEntry(KLOGENTRYPARMS, pszProto, TRUE,a0,a1,a2,a3)
-    #define KLOGENTRY5(pszRetType, pszProto, a0,a1,a2,a3,a4)            KLOGENTRYVARS(pszRetType) = kLogEntry(KLOGENTRYPARMS, pszProto, TRUE,a0,a1,a2,a2,a4)
-    #define KLOGENTRY6(pszRetType, pszProto, a0,a1,a2,a3,a4,a5)         KLOGENTRYVARS(pszRetType) = kLogEntry(KLOGENTRYPARMS, pszProto, TRUE,a0,a1,a2,a2,a4,a5)
-    #define KLOGENTRY7(pszRetType, pszProto, a0,a1,a2,a3,a4,a5,a6)      KLOGENTRYVARS(pszRetType) = kLogEntry(KLOGENTRYPARMS, pszProto, TRUE,a0,a1,a2,a2,a4,a5,a6)
-    #define KLOGENTRY8(pszRetType, pszProto, a0,a1,a2,a3,a4,a5,a6,a7)   KLOGENTRYVARS(pszRetType) = kLogEntry(KLOGENTRYPARMS, pszProto, TRUE,a0,a1,a2,a2,a4,a5,a6,a7)
-    #define KLOGENTRY9(pszRetType, pszProto, a0,a1,a2,a3,a4,a5,a6,a7,a8)            KLOGENTRYVARS(pszRetType) = kLogEntry(KLOGENTRYPARMS, pszProto, TRUE,a0,a1,a2,a2,a4,a5,a6,a7,a8)
-    #define KLOGENTRY10(pszRetType, pszProto, a0,a1,a2,a3,a4,a5,a6,a7,a8,a9)        KLOGENTRYVARS(pszRetType) = kLogEntry(KLOGENTRYPARMS, pszProto, TRUE,a0,a1,a2,a2,a4,a5,a6,a7,a8,a9)
-    #define KLOGENTRY11(pszRetType, pszProto, a0,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10)    KLOGENTRYVARS(pszRetType) = kLogEntry(KLOGENTRYPARMS, pszProto, TRUE,a0,a1,a2,a2,a4,a5,a6,a7,a8,a9,a10)
-
-    #define KLOGEXIT(uValue)                                            kLogExit( KLOGMODHANDLE, KLOGPOS_EXT,                 KLOGRETURNTYPE, uValue);  kLogDummyVariable = kLogDummyVariable
-    #define KLOGEXITVOID()                                              kLogExit( KLOGMODHANDLE, KLOGPOS_EXT,                 KLOGRETURNTYPE, NULL);    kLogDummyVariable = kLogDummyVariable
-
-    #define KLOGSTOP(uValue)                                            kLogStop( KLOGMODHANDLE, KLOGPOS_EXT, SSToDS(&KLOGSEQHANDLE), KLOGRETURNTYPE, uValue);  kLogDummyVariable = kLogDummyVariable
-    #define KLOGSTOPVOID(uValue)                                        kLogStop( KLOGMODHANDLE, KLOGPOS_EXT, SSToDS(&KLOGSEQHANDLE), KLOGRETURNTYPE, NULL);    kLogDummyVariable = kLogDummyVariable
-
-    #ifdef KLOG_USE_RETURN
-        #if KLOG_USE_RETURN
-            #define return(value)                                       KLOGEXIT(value); return (value)
-        #else
-            #define return(value)                                       KLOGSTOP(value); return (value)
-        #endif
-    #endif
-
-    #define dprintf(a)                                                  kLogFixPrintf2(KLOGMODHANDLE, KLOGPOS_EXT, KLOG_TYPE_PRINTF, kLogFixPrintf1 a)
-    #define kprintf(a)                                                  dprintf(a)
-
-#else
-
-    #define KLOGINITMOD(pMod)                                           ((HKLOGMOD)-1)
-    #define KLOGTERMMOD()                                               ((void)0)
-
-    #ifdef __cplusplus
-        #define KLOGDUMMY   ((void)0)
-    #else
-        #define KLOGDUMMY   void
-    #endif
-
-    #define KLOGSTART( pszRetType, pszProto, arg0)                      KLOGDUMMY
-    #define KLOGSTART0(pszRetType)                                      KLOGDUMMY
-    #define KLOGSTART1(pszRetType, pszProto, a0)                        KLOGDUMMY
-    #define KLOGSTART2(pszRetType, pszProto, a0,a1)                     KLOGDUMMY
-    #define KLOGSTART3(pszRetType, pszProto, a0,a1,a2)                  KLOGDUMMY
-    #define KLOGSTART4(pszRetType, pszProto, a0,a1,a2,a3)               KLOGDUMMY
-    #define KLOGSTART5(pszRetType, pszProto, a0,a1,a2,a3,a4)            KLOGDUMMY
-    #define KLOGSTART6(pszRetType, pszProto, a0,a1,a2,a3,a4,a5)         KLOGDUMMY
-    #define KLOGSTART7(pszRetType, pszProto, a0,a1,a2,a3,a4,a5,a6)      KLOGDUMMY
-    #define KLOGSTART8(pszRetType, pszProto, a0,a1,a2,a3,a4,a5,a6,a7)   KLOGDUMMY
-    #define KLOGSTART9(pszRetType, pszProto, a0,a1,a2,a3,a4,a5,a6,a7,a8)            KLOGDUMMY
-    #define KLOGSTART10(pszRetType, pszProto, a0,a1,a2,a3,a4,a5,a6,a7,a8,a9)        KLOGDUMMY
-    #define KLOGSTART11(pszRetType, pszProto, a0,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10)    KLOGDUMMY
-
-    #define KLOGENTRY( pszRetType, pszProto, arg0)                      KLOGDUMMY
-    #define KLOGENTRY0(pszRetType)                                      KLOGDUMMY
-    #define KLOGENTRY1(pszRetType, pszProto, a0)                        KLOGDUMMY
-    #define KLOGENTRY2(pszRetType, pszProto, a0,a1)                     KLOGDUMMY
-    #define KLOGENTRY3(pszRetType, pszProto, a0,a1,a2)                  KLOGDUMMY
-    #define KLOGENTRY4(pszRetType, pszProto, a0,a1,a2,a3)               KLOGDUMMY
-    #define KLOGENTRY5(pszRetType, pszProto, a0,a1,a2,a3,a4)            KLOGDUMMY
-    #define KLOGENTRY6(pszRetType, pszProto, a0,a1,a2,a3,a4,a5)         KLOGDUMMY
-    #define KLOGENTRY7(pszRetType, pszProto, a0,a1,a2,a3,a4,a5,a6)      KLOGDUMMY
-    #define KLOGENTRY8(pszRetType, pszProto, a0,a1,a2,a3,a4,a5,a6,a7)   KLOGDUMMY
-    #define KLOGENTRY9(pszRetType, pszProto, a0,a1,a2,a3,a4,a5,a6,a7,a8)            KLOGDUMMY
-    #define KLOGENTRY10(pszRetType, pszProto, a0,a1,a2,a3,a4,a5,a6,a7,a8,a9)        KLOGDUMMY
-    #define KLOGENTRY11(pszRetType, pszProto, a0,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10)    KLOGDUMMY
-
-    #define KLOGEXIT(uValue)                                            ((void)0)
-    #define KLOGEXITVOID()                                              ((void)0)
-
-    #define KLOGSTOP(uValue)                                            ((void)0)
-    #define KLOGSTOPVOID()                                              ((void)0)
-
-    #define kprintf(a)                                                  ((void)0)
-    #define dprintf(a)                                                  ((void)0)
-#endif
-
-
-/*******************************************************************************
-*   Global Variables                                                           *
-*******************************************************************************/
-extern HKLOGMOD KLOGMODHANDLE;   /* Define this on the behalf of the kKL user. */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
Index: trunk/src/win32k/kKrnlLib/include/kTypes.h
===================================================================
--- trunk/src/win32k/kKrnlLib/include/kTypes.h	(revision 8070)
+++ 	(revision )
@@ -1,185 +1,0 @@
-/* $Id: kTypes.h,v 1.5 2001-12-14 21:36:31 bird Exp $
- *
- * Common typedefinitions for kLib.
- *
- * Copyright (c) 2001 knut st. osmundsen (kosmunds@csc.com)
- *
- */
-
-#ifndef _kTypes_h_
-#define _kTypes_h_
-
-
-
-/*******************************************************************************
-*   IBM C Compilers                                                            *
-*******************************************************************************/
-#ifdef __IBMC__
-
-    #define INLINE      _Inline
-    #define KLIBCALL    _Optlink
-    #ifndef __builtin_h
-    void _Builtin       __interrupt( const unsigned int );
-    #endif
-    #define INT3()      __interrupt(3)
-
-    typedef unsigned long KSIZE;
-    typedef unsigned long KBOOL;
-
-#endif
-
-
-/*******************************************************************************
-*   IBM C++ Compilers                                                          *
-*******************************************************************************/
-#ifdef __IBMCPP__
-
-    #define INLINE      inline
-    #define KLIBCALL    _Optlink
-    #ifndef __builtin_h
-    void _Builtin       __interrupt( const unsigned int );
-    #endif
-    #define INT3()      __interrupt(3)
-
-    typedef unsigned long KSIZE;
-    typedef unsigned long KBOOL;
-
-#endif
-
-
-/*******************************************************************************
-*   Common stuff                                                               *
-*******************************************************************************/
-#ifndef TRUE
-#   define TRUE         1
-#endif
-
-#ifndef FALSE
-#   define FALSE        0
-#endif
-
-#ifndef PAGESIZE
-#   define PAGESIZE     0x1000
-#endif
-
-#ifndef PAGESHIFT
-#   define PAGESHIFT    12
-#endif
-
-#ifndef NULL
-#   ifdef __cplusplus
-#       define NULL 0
-#   else
-#       define NULL ((void *)0)
-#   endif
-#endif
-
-
-/**
- * Maximum value a or b.
- */
-#define KMAX(a, b)                  (((a) >= (b)) ? (a) : (b))
-
-/**
- * Minimum value a or b.
- */
-#define KMIN(a, b)                  (((a) <= (b)) ? (a) : (b))
-
-/**
- * Lowest value which isn't NULL.
- */
-#define KMINNOTNULL(a, b)    ((a) != NULL && (b) != NULL ? KMIN(a,b) : ((a) != NULL ? (a) : (b)))
-
-
-/**
- * Not referenced parameter warning fix.
- */
-#define KNOREF(a) (a=a)
-
-/**
- * Aligns something, a, up to nearest alignment boundrary-
- * Note: Aligment must be a 2**n number.
- */
-#define KALIGNUP(alignment, a)      (((KSIZE)(a) + ((KSIZE)(alignment) - 1)) & ~((KSIZE)(alignment) - 1))
-
-/**
- * Aligns something, a, down to nearest alignment boundrary-
- * Note: Aligment must be a 2**n number.
- */
-#define KALIGNDOWN(alignment, a)    ((KSIZE)(a) & ~((KSIZE)(alignment) - 1))
-
-/**
- * Offset of struct member.
- */
-#define KOFFSETOF(type, member)     ((KSIZE) &((type *)0)->member )
-
-/**
- * Size of a struct member.
- */
-#define KSIZEOF(type, member)       (((KSIZE) sizeof(((type *)0)->member) )
-
-/**
- * Determins the number of entires declared in an array.
- */
-#define KCENTRIES(arrayvar)         (sizeof(arrayvar) / sizeof((arrayvar)[0]))
-
-
-#if !defined(RING0) || defined(INCL_16)
-    /**
-     * Validates that a pointer is within the expected address range.
-     */
-    #define KVALIDPTR(pv)       (   (KSIZE)(pv) <= (KSIZE)0xc0000000UL \
-                                 && (KSIZE)(pv) >= (KSIZE)0x00010000)
-    /**
-     * Validates that a memory range is within the expected address range.
-     */
-    #define KVALIDPTRRANGE(pv, cb) ((KSIZE)(pv) + (KSIZE)(cb) >= (KSIZE)(pv) \
-                                 && (KSIZE)(pv) + (KSIZE)(cb) <= (KSIZE)0xc0000000UL \
-                                 && (KSIZE)(pv) >= (KSIZE)0x00010000UL)
-
-    #ifndef SSToDS
-    /**
-     * SSToDS converts stack address to data addresses.
-     */
-    #define SSToDS(p)       ((void*)p)
-    #endif
-#else
-    /**
-     * Validates that a pointer is within the expected address range.
-     */
-    #define KVALIDPTR(pv)       (   (KSIZE)(pv) <= (KSIZE)0xfffe0000UL \
-                                 && (KSIZE)(pv) >= (KSIZE)0x00010000UL)
-    /**
-     * Validates that a memory range is within the expected address range.
-     */
-    #define KVALIDPTRRANGE(pv, cb) ((KSIZE)(pv) + (KSIZE)(cb) >= (KSIZE)(pv) \
-                                 && (KSIZE)(pv) + (KSIZE)(cb) <= (KSIZE)0xfffe0000UL \
-                                 && (KSIZE)(pv) >= (KSIZE)0x00010000UL)
-
-    #ifndef SSToDS
-    /**
-     * SSToDS converts stack address to data addresses.
-     */
-    #ifdef KKRNLLIB
-        extern unsigned long *pulTKSSBase32;
-        #define SSToDS(p) ((void*)((unsigned long)(p) + *pulTKSSBase32))
-    #else
-        extern unsigned long TKSSBase;
-        #define SSToDS(p) ((void*)((unsigned long)(p) + TKSSBase))
-    #endif
-    #endif
-#endif
-
-
-/*
- * Assert macro and function.
- */
-#define kASSERT(expr) \
-    ((expr) ? (void)0 : (kAssertMsg(#expr, __FILE__, __LINE__, __FUNCTION__) ? INT3() : (void)0))
-
-KBOOL KLIBCALL kAssertMsg(const char *pszExpr, const char *pszFilename, unsigned uLine, const char *pszFunction);
-
-
-
-#endif
-
