Changeset 20072

Timestamp:

Dec 19, 2002, 2:49:11 AM (22 years ago)

Author:

bird

Message:

Just big commit.

Location:

tags/trunk/src/win32k/kKrnlLib

Files:

• include/OS2Krnl.h (modified) (3 diffs)
• include/krnlPrivate.h (modified) (3 diffs)
• kKrnlLib.def (modified) (1 diff)
• src/Extract.mak (modified) (2 diffs)
• src/Extract32.c (modified) (21 diffs)
• src/Makefile (modified) (2 diffs)
• src/devFirst.asm (modified) (6 diffs)
• src/extract.c (modified) (8 diffs)
• src/krnlInit.c (modified) (15 diffs)
• src/krnlLoadKernelSym.c (modified) (6 diffs)
• src/krnlLoadKernelSymFile.c (modified) (19 diffs)
• src/krnlLockedWrite.asm (modified) (4 diffs)
• src/krnlOverloading.c (modified) (14 diffs)
• src/krnlPrologs.c (modified) (4 diffs)
• src/krnlStubs.c (modified) (3 diffs)
• src/krnlWrappers.asm (modified) (1 diff)
• tools/Makefile (modified) (2 diffs)
• tools/ignore.mak (modified) (2 diffs)
• tools/kDevTest/kDevTest.vpj (modified) (1 diff)
• tools/kDevTest/kDevTest.vtg (modified) ( previous)
• tools/libconv.mak (modified) (2 diffs)

tags/trunk/src/win32k/kKrnlLib/include/OS2Krnl.h ¶

@@ -1 @@
-/* $Id: OS2Krnl.h,v 1.4 2002-12-16 02:25:06 bird Exp $
+/* $Id: OS2Krnl.h,v 1.5 2002-12-19 01:49:06 bird Exp $
  *
  * OS/2 kernel structures, typedefs and macros.
@@ -30 +30 @@
 
 
+/*******************************************************************************
+*   Header Files                                                               *
+*******************************************************************************/
 /*
  * "OS2KDefs.h"
  */
+/* NOASM */
+#include <os2def.h>
+/* ASM */
 #if !defined(OS2_INCLUDED)
     /* when used with h2inc.exe */
@@ -42 +48 @@
 #endif
 
+
+/*******************************************************************************
+*   Defined Constants And Macros                                               *
+*******************************************************************************/
 /* undefine everything defined below to quite compiler */
 #undef  PAGESIZE

tags/trunk/src/win32k/kKrnlLib/include/krnlPrivate.h ¶

@@ -1 @@
-/* $Id: krnlPrivate.h,v 1.4 2002-12-16 02:25:07 bird Exp $
+/* $Id: krnlPrivate.h,v 1.5 2002-12-19 01:49:06 bird Exp $
  *
- * Private header file for the krnl*.c* files.
+ * Private header file for the krnl part.
  *
- * Copyright (c) 2001 knut st. osmundsen (kosmunds@csc.com)
+ * Copyright (c) 2001-2003 knut st. osmundsen <bird@anduin.net>
  *
- * Project Odin Software License can be found in LICENSE.TXT
+ *
+ * This file is part of kKrnlLib.
+ *
+ * kKrnlLib is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * kKrnlLib is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with kKrnlLib; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
@@ -34 +49 @@
 extern OTE                      KKL_ObjTab[4];                  /* calltaba.asm */
 extern OTE                      KKL_ObjTab_DosCalls[20];        /* calltaba.asm */
+extern PMTE                     pKrnlMTE;                       /* krnlInit.c */
+extern PSMTE                    pKrnlSMTE;                      /* krnlInit.c */
+extern POTE                     pKrnlOTE;                       /* krnlInit.c */
+extern int                      cKernelObjects;                 /* krnlInit.c */
 #endif
 extern char                     KKL_ResNameTab[1];              /* calltaba.asm */
@@ -44 +63 @@
 
 
+
 /*******************************************************************************
 *   Functions                                                                  *
 *******************************************************************************/
-extern void _Optlink    LockedWrite(unsigned long ulAddr, unsigned char chOpcode, unsigned long ulDword);
-extern int  _Optlink    MakeCalltab16CodeSegment(void);
+extern void _Optlink    krnlLockedWrite(unsigned long ulAddr, unsigned char chOpcode, unsigned long ulDword);
+extern int  _System     krnlMakeCalltab16CodeSegment(void);
 extern int              krnlLoadKernelSym(void);
-extern int              krnlLoadKernelSymFile(const char *pszFilename);
+extern int              krnlVerifyImportTab(void);
+#ifdef _OS2KLDR_H_
+extern int              krnlLoadKernelSymFile(const char *pszFilename, POTE paOTEs, int cOTEs);
+extern PMTE _System     krnlGetOS2KrnlMTE(void);
+#endif
+extern int              krnlInterpretProlog32(char *pach);
+extern int              krnlInterpretProlog16(char *pach);
+
 
 #endif

tags/trunk/src/win32k/kKrnlLib/kKrnlLib.def ¶

@@ -15 +15 @@
     DATA16_CONST        class 'FAR_DATA'
     DATA16_GLOBAL       class 'FAR_DATA'
-    DATA16_INIT         class 'FAR_DATA'
-    DATA16_INIT_BSS     class 'FAR_DATA'
-    DATA16_INIT_CONST   class 'FAR_DATA'
+    DATA16_END          class 'FAR_DATA'
 
     CODE16              class 'CODE'
     CODE16_IOSEG        class 'CODE'
-    CODE16_INIT         class 'CODE'
+    CODE16_END          class 'CODE'
 
     LOGDATA_16BIT       class 'LOGDATA_16BIT'

tags/trunk/src/win32k/kKrnlLib/src/Extract.mak ¶

@@ -1 @@
-# $Id: Extract.mak,v 1.11 2002-12-16 02:24:27 bird Exp $
+# $Id: Extract.mak,v 1.12 2002-12-19 01:49:07 bird Exp $
 
 #
@@ -27 +27 @@
 
 TARGET_OBJS =\
+$(PATH_TARGET)\Extract.$(EXT_OBJ)\
 $(PATH_TARGET)\Extract32.$(EXT_OBJ)\
 $(PATH_TARGET)\krnlPrologs.$(EXT_OBJ)\
 $(PATH_TARGET)\krnlImportTable.$(EXT_OBJ)\
+$(PATH_TARGET)\krnlLoadKernelSymFile.$(EXT_OBJ)\
 
 TARGET_LIBS =\
 $(LIB_OS)\
-$(LIB_C_NRE)\
+$(LIB_C_OBJ)\
 
 #

tags/trunk/src/win32k/kKrnlLib/src/Extract32.c ¶

@@ -1 @@
-/* $Id: Extract32.c,v 1.1 2002-03-10 02:45:48 bird Exp $
- *
- * 32-bit Extract Routines.
+/* $Id: Extract32.c,v 1.2 2002-12-19 01:49:07 bird Exp $
+ *
  * This is used to get opcodes for a kernel.
- *
- * Copyright (c) 2001 knut st. osmundsen (kosmunds@csc.com)
- *
- * Project Odin Software License can be found in LICENSE.TXT
+ * (Was 32bit part of mixed program, now everything is 32-bit.)
+ *
+ * Copyright (c) 2001-2003 knut st. osmundsen <bird@anduin.net>
+ *
+ *
+ * This file is part of kKrnlLib.
+ *
+ * kKrnlLib is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * kKrnlLib is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with kKrnlLib; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
@@ -26 +41 @@
 #define SSToDS(a) ((void*)(a))
 
+
+/*******************************************************************************
+*   Header Files                                                               *
+*******************************************************************************/
+#include <kLib/format/LXexe.h>
+
 #define INCL_BASE
+#include <os2.h>
 #define INCL_OS2KRNL_ALL
-#define FOR_EXEHDR          1           /* OBJEXEC */
-#define DWORD   ULONG                   /* exe386.h */
-#define WORD    USHORT
-
-/*******************************************************************************
-*   Header Files                                                               *
-*******************************************************************************/
-#include <os2.h>
-#include <exe386.h>
+#include "os2krnl.h"
+
+#include "krnlImportTable.h"
+#include "krnlPrivate.h"
 
 #include <stdio.h>
 #include <string.h>
 
-#include "devSegDf.h"
-#include "dev32.h"
-#include "Probkrnl.h"
-#include "os2krnl.h"
 
 
@@ -135 +148 @@
 *******************************************************************************/
 int             cObjects = 14;
-OTE             aKrnlOTE[24];
+OTE             aKrnlOTE[42];
 HMODULE         hmodKrnl = NULLHANDLE;
 
@@ -142 +155 @@
 *   Internal Functions                                                         *
 *******************************************************************************/
-void _rmem_init(void);
 int  kernelInit(int iTest, int argc, char **argv);
 
@@ -152 +164 @@
     /* from OS/2 Toolkit v4.5 */
     APIRET APIENTRY DosQuerySysState(ULONG EntityList, ULONG EntityLevel, PID pid,
-                                    TID tid, PVOID pDataBuf, ULONG cbBuf);
+                                     TID tid, PVOID pDataBuf, ULONG cbBuf);
     #define QS_MTE         0x0004
 #endif
-
-
-
-/**
- * Initiates the 32-bit C-runtime library.
- */
-void _Far16 _Cdecl Init32bitCrt(void)
-{
-    _rmem_init();
-}
 
 
@@ -181 +183 @@
  *          Assumes that Init32bitCrt is called.
  */
-USHORT _Far16 _Cdecl GetOpcodes(char * _Seg16 pszKrnlFile16, unsigned short cSymObjects)
+int GetOpcodes(char * pszKrnlFile, unsigned cSymObjects)
 {
-    USHORT  rc = 0;
-    char *  pszKrnlFile = pszKrnlFile16;
+    int  rc = 0;
     char *  argv[4] = {NULL, NULL, NULL, NULL};
     argv[2] = pszKrnlFile;
@@ -214 +215 @@
                 if (aImportTab[i].offObject >= aKrnlOTE[iObj].ote_size)
                 {
-                    sprintf(pszKrnlFile, "Func %d offset out of object %d (0x%x >= 0x%x)\n",
+                    fprintf(stderr, "Func %d offset out of object %d (0x%x >= 0x%x)\n",
                             i, aImportTab[i].offObject, aKrnlOTE[iObj].ote_size);
                     rc = 1;
@@ -225 +226 @@
                 if ((aKrnlOTE[iObj].ote_flags & (OBJBIGDEF | OBJEXEC)) == (OBJBIGDEF | OBJEXEC))
                 {   /* 32-bit */
-                    cb = interpretFunctionProlog32((char*)aKrnlOTE[iObj].ote_base + aImportTab[i].offObject);
+                    cb = krnlInterpretProlog32((char*)aKrnlOTE[iObj].ote_base + aImportTab[i].offObject);
                 }
                 else if ((aKrnlOTE[iObj].ote_flags & (OBJBIGDEF | OBJEXEC)) == (OBJEXEC))
                 {   /* 16-bit */
-                    cb = interpretFunctionProlog16((char*)aKrnlOTE[iObj].ote_base + aImportTab[i].offObject);
+                    cb = krnlInterpretProlog16((char*)aKrnlOTE[iObj].ote_base + aImportTab[i].offObject);
                 }
                 else
                 {
-                    sprintf(pszKrnlFile, "Func %d isn't in a code segment.\n", i);
+                    fprintf(stderr, "Func %d isn't in a code segment.\n", i);
                     rc = 2;
                     break;
@@ -240 +241 @@
                 if (cb < 5)
                 {
-                    sprintf(pszKrnlFile, "Func %d unknown prolog (obj=0x%x off=0x%x)\n",
+                    fprintf(stderr, "Func %d unknown prolog (obj=0x%x off=0x%x)\n",
                             i, iObj, aImportTab[i].offObject);
                     rc = 3;
@@ -254 +255 @@
         else
         {
-            sprintf(pszKrnlFile, "Invalid object count (%d != %d)\n",
+            fprintf(stderr, "Invalid object count (%d != %d)\n",
                     cObjects, aImportTab[0].iObject + 1);
             rc = 4;
@@ -312 +313 @@
         if (argc < 3)
         {
-            printf("Missing parameter!\n");
+            fprintf(stderr, "Missing parameter!\n");
             return FALSE;
         }
@@ -323 +324 @@
     if (DosScanEnv("TMP", &pszTmp) != NO_ERROR || pszTmp == NULL)
     {
-        printf("Environment variable TMP is not set.\n");
+        fprintf(stderr, "Environment variable TMP is not set.\n");
         return FALSE;
     }
@@ -341 +342 @@
     {
         if (rc != ERROR_FILE_NOT_FOUND && rc != ERROR_PATH_NOT_FOUND)
-            printf("Failed to copy %s to %s. rc=%d\n", pszSrcName, szName, rc);
+            fprintf(stderr, "Failed to copy %s to %s. rc=%d\n", pszSrcName, szName, rc);
         return FALSE;
     }
@@ -349 +350 @@
         )
     {
-        printf("Failed to set attributes for %s.\n", szName);
+        fprintf(stderr, "Failed to set attributes for %s.\n", szName);
         return FALSE;
     }
@@ -364 +365 @@
     if (rc != NO_ERROR)
     {
-        printf("Failed to open temporary kernel file. rc = %d\n", rc);
+        fprintf(stderr, "Failed to open temporary kernel file. rc = %d\n", rc);
         return FALSE;
     }
@@ -371 +372 @@
     {
         DosClose(hFile);
-        printf("Failed to read LX header from temporary kernel file.\n");
+        fprintf(stderr, "Failed to read LX header from temporary kernel file.\n");
         return FALSE;
     }
@@ -378 +379 @@
     {
         DosClose(hFile);
-        printf("Failed to read LX header from temporary kernel file (2).\n");
+        fprintf(stderr, "Failed to read LX header from temporary kernel file (2).\n");
         return FALSE;
     }
@@ -388 +389 @@
     {
         DosClose(hFile);
-        printf("Failed to write patched LX header to temporary kernel file.\n");
+        fprintf(stderr, "Failed to write patched LX header to temporary kernel file.\n");
         return FALSE;
     }
@@ -399 +400 @@
     if (rc != NO_ERROR && (rc != ERROR_INVALID_PARAMETER && hmodKrnl == NULLHANDLE))
     {
-        printf("Failed to load OS/2 kernel image %s.");
+        fprintf(stderr, "Failed to load OS/2 kernel image %s.");
         return FALSE;
     }
@@ -409 +410 @@
     if (rc != NO_ERROR)
     {
-        printf("DosQuerySysState failed with rc=%d.\n", rc);
+        fprintf(stderr, "DosQuerySysState failed with rc=%d.\n", rc);
         return FALSE;
     }
@@ -452 +453 @@
     if (pLrec == NULL)
     {
-        printf("DosQuerySysState(os2krnl): not found\n");
+        fprintf(stderr, "DosQuerySysState(os2krnl): not found\n");
         return FALSE;
     }
     if (pLrec->pObjInfo == NULL)
     {
-        printf("DosQuerySysState(os2krnl): no object info\n");
+        fprintf(stderr, "DosQuerySysState(os2krnl): no object info\n");
         return FALSE;
     }

tags/trunk/src/win32k/kKrnlLib/src/Makefile ¶

@@ -1 @@
-# $Id: Makefile,v 1.12 2002-12-16 02:24:27 bird Exp $
+# $Id: Makefile,v 1.13 2002-12-19 01:49:07 bird Exp $
 
 #
@@ -45 +45 @@
 $(PATH_TARGET)\env.$(EXT_OBJ)\
 $(PATH_TARGET)\krnlInit.$(EXT_OBJ)\
+$(PATH_TARGET)\krnlImportTable.$(EXT_OBJ)\
+$(PATH_TARGET)\krnlLoadKernelSym.$(EXT_OBJ)\
+$(PATH_TARGET)\krnlLoadKernelSymFile.$(EXT_OBJ)\
 $(PATH_TARGET)\krnlLockedWrite.$(EXT_OBJ)\
 $(PATH_TARGET)\krnlOverloading.$(EXT_OBJ)\

tags/trunk/src/win32k/kKrnlLib/src/devFirst.asm ¶

@@ -1 @@
-; $Id: devFirst.asm,v 1.3 2002-12-16 02:24:28 bird Exp $
+; $Id: devFirst.asm,v 1.4 2002-12-19 01:49:07 bird Exp $
 ;
 ; DevFirst - entrypoint, helper code, and segment definitions.
@@ -53 +53 @@
     public _CallR0Addr32bit
     public _SSToDS_16a
-    public GetOS2KrnlMTE
+    public krnlGetOS2KrnlMTE
+    public krnlMakeCalltab16CodeSegment
     public x86DisableWriteProtect
     public x86RestoreWriteProtect
-    public MakeCalltab16CodeSegment
     public _GetR0InitPtr
     public _GetVerifyImportTab32Ptr
@@ -301 +301 @@
 ;;
 ; Gets the a 32-bit flat pointer to the OS/2 Kernel MTE.
-; @cproto    extern PMTE _System GetOS2KrnlMTE(void);
+; @cproto    extern PMTE _System krnlGetOS2KrnlMTE(void);
 ; @returns   Pointer to kernel MTE.
 ; @status    completely implemented.
 ; @author    knut st. osmundsen
-GetOS2KrnlMTE PROC NEAR
+krnlGetOS2KrnlMTE PROC NEAR
     push    es
 
@@ -318 +318 @@
     pop     es
     ret
-GetOS2KrnlMTE ENDP
+krnlGetOS2KrnlMTE ENDP
 
 
@@ -389 +389 @@
 ; @uses     eax
 ; @author   knut st. osmundsen (kosmunds@csc.com)
-MakeCalltab16CodeSegment proc near
+krnlMakeCalltab16CodeSegment proc near
     ASSUME  ds:FLAT, ss:nothing
     xor     eax, eax
@@ -440 +440 @@
 mccs_ret:
     ret
-MakeCalltab16CodeSegment endp
+krnlMakeCalltab16CodeSegment endp
 
 

tags/trunk/src/win32k/kKrnlLib/src/extract.c ¶

@@ -1 @@
-/* $Id: extract.c,v 1.4 2002-12-16 02:24:28 bird Exp $
+/* $Id: extract.c,v 1.5 2002-12-19 01:49:08 bird Exp $
  *
  * SymDB32 entry generator.
@@ -59 +59 @@
 *   Global Variables                                                           *
 *******************************************************************************/
-/* Result from GetKernelInfo/ReadOS2Krnl. */
-extern unsigned char    cObjects;
-extern POTE             paKrnlOTEs;
+/* Statistics. */
 unsigned long           cbSize;
 unsigned long           cbAllSize;
 
-/* dummy replacement for SymDB.c */
-KRNLDBENTRY aKrnlSymDB[] = {{0}};
 
 /*******************************************************************************
@@ -72 +68 @@
 *******************************************************************************/
 int      processFile(const char *pszFilename);
-
-
-/*******************************************************************************
-*   External Functions                                                         *
-*******************************************************************************/
-/* Workers */
-extern int  ProbeSymFile(const char *pszFilename);
-extern int  GetOpcodes(const char *pszKrnlFile, unsigned int cSymObjects);
+extern int GetOpcodes(char * pszKrnlFile, unsigned cSymObjects); /* extract32.c */
 
 
@@ -127 +116 @@
         )
     {
-        fprintf(stderr, "invalid filename: %s\n", pszFilename);
+        fprintf(stderr, "invalid filename: %s (%s)\n", psz, pszFilename);
         return 2;
     }
@@ -134 +123 @@
      * Probe kernelfile
      */
-    rc = ProbeSymFile(pszFilename);
+    rc = krnlLoadKernelSymFile(pszFilename, NULL, 0);
 
 
@@ -231 +220 @@
     }
     else
-        fprintf(stderr, "ProbeSymFile failed with rc=%d\n", rc);
+        fprintf(stderr, "krnlLoadKernelSymFile failed with rc=0x%x (%d)\n", rc, rc);
 
     return rc;
@@ -255 +244 @@
      * Set paKrnlOTEs to point to an zeroed array of OTEs.
      */
-    static KRNLINFO KrnlInfo = {0};
-    paKrnlOTEs = &KrnlInfo.aObjects[0];
     cbAllSize = cbSize = 0;
 
@@ -309 +296 @@
         int             i;
 
-        printf(";/* $Id: extract.c,v 1.4 2002-12-16 02:24:28 bird Exp $\n"
+        printf(";/* $Id: extract.c,v 1.5 2002-12-19 01:49:08 bird Exp $\n"
                ";*\n"
                ";* Autogenerated kernel symbol database.\n"

tags/trunk/src/win32k/kKrnlLib/src/krnlInit.c ¶

@@ -1 @@
-/* $Id: krnlInit.c,v 1.3 2002-12-16 02:24:29 bird Exp $
+/* $Id: krnlInit.c,v 1.4 2002-12-19 01:49:08 bird Exp $
  *
  * Init the OS2 Kernel facilities; identify it, find symbols, import table.
@@ -25 +25 @@
 
 #ifndef NOFILEID
-static const char szFileId[] = "$Id: krnlInit.c,v 1.3 2002-12-16 02:24:29 bird Exp $";
+static const char szFileId[] = "$Id: krnlInit.c,v 1.4 2002-12-19 01:49:08 bird Exp $";
 #endif
 
@@ -41 +41 @@
 *   Header Files                                                               *
 *******************************************************************************/
-#include <kLib/format/LXexe.h>
 #include <kLib/kTypes.h>
 #include <kLib/kDevHlp.h>
-
-#define INCL_DOSERRORS
-#define INCL_NOPMAPI
-#include <os2.h>
+#include <kLib/format/LXexe.h>
+
+#include <os2def.h>
 #include <string.h>
 
@@ -59 +57 @@
 #include "kKrnlLib.h"
 
-#include "dev1632.h"
-#include "dev32.h"
-#include "ProbKrnl.h"
-#include "ProbKrnlErrors.h"
+#include "devErrors.h"
+#include "krnlImportTable.h"
 #include "krnlPrivate.h"
 
@@ -80 +76 @@
 PSMTE       pKrnlSMTE = NULL;           /* Initiated by krnlGetKernelInfo */
 POTE        pKrnlOTE = NULL;            /* Initiated by krnlGetKernelInfo */
-ULONG       cKernelObjects = 0;         /* Initiated by krnlGetKernelInfo */
+int         cKernelObjects = 0;         /* Initiated by krnlGetKernelInfo */
 
 extern char callTab[1];
@@ -90 +86 @@
 int         krnlGetKernelInfo(void);
 int         krnlLookupKernel(void);
-int         krnlVerifyImportTab(void);
 
 int         krnlInitImports(void);
@@ -168 +163 @@
     /* Find the kernel OTE table */
 #ifndef R3TST
-    pKrnlMTE = GetOS2KrnlMTE();
+    pKrnlMTE = krnlGetOS2KrnlMTE();
 #else
     pKrnlMTE = GetOS2KrnlMTETst();
@@ -177 +172 @@
         if (pKrnlSMTE != NULL)
         {
-            if (pKrnlSMTE->smte_objcnt <= MAXKRNLOBJECTS)
+            if (pKrnlSMTE->smte_objcnt <= 42)
             {
                 pKrnlOTE = pKrnlSMTE->smte_objtab;
@@ -320 +315 @@
         rc = ERROR_D32_GETOS2KRNL_FAILED;
 
-    if (rc != NO_ERROR)
+    if (!rc)
         kprintf(("krnlGetKernelInfo: failed. rc = %d\n", rc));
 
@@ -494 +489 @@
                 if (EPT32BitEntry(aImportTab[i]))
                 {
-                    cb = interpretFunctionProlog32((char*)aImportTab[i].ulAddress);
+                    cb = krnlInterpretProlog32((char*)aImportTab[i].ulAddress);
                     cbmax = OVERLOAD32_ENTRY - 5; /* 5 = Size of the jump instruction */
                 }
                 else
                 {
-                    cb = interpretFunctionProlog16((char*)aImportTab[i].ulAddress);
+                    cb = krnlInterpretProlog16((char*)aImportTab[i].ulAddress);
                     cbmax = OVERLOAD16_ENTRY - 5; /* 5 = Size of the jump instruction */
                 }
@@ -530 +525 @@
     }
 
-    KLOGEXIT(NO_ERROR);
-    return NO_ERROR;
+    KLOGEXIT(0);
+    return 0;
 }
-
-
-
-
-
-
-/**
- * Initiates the exported functions and MTE.
- * @returns 0 on success.
- *          -1 on failure.
- */
-int krnlInit2(void)
-{
-    KLOGENTRY0("int");
-    int rc = krnlInitExports();
-    KLOGEXIT(rc);
-    return rc;
-}
-
 
 
@@ -624 +600 @@
             case EPT_PROC32:
             {
-                cb = interpretFunctionProlog32((char*)aImportTab[i].ulAddress);
+                cb = krnlInterpretProlog32((char*)aImportTab[i].ulAddress);
                 aImportTab[i].cbProlog = (char)cb;
                 if (   cb >= 5                      /* 5(1st): size of jump instruction in the function prolog which jumps to my overloading function */
@@ -676 +652 @@
             case EPT_PROCH16:
             {
-                cb = interpretFunctionProlog16((char*)aImportTab[i].ulAddress);
+                cb = krnlInterpretProlog16((char*)aImportTab[i].ulAddress);
                 aImportTab[i].cbProlog = (char)cb;
                 if (   cb >= 5                          /* 5:      size of a 16:16 jump which jumps to my overloading function */
@@ -767 +743 @@
      */
     #ifndef R3TST
-    if (MakeCalltab16CodeSegment())
-    {
-        kprintf(("MakeCalltab16CodeSegment failed\n"));
+    if (krnlMakeCalltab16CodeSegment())
+    {
+        kprintf(("krnlMakeCalltab16CodeSegment failed\n"));
         INT3();
     }
     #endif
 
-    KLOGEXIT(NO_ERROR);
-    return NO_ERROR;
+    KLOGEXIT(0);
+    return 0;
 }
 
@@ -841 +817 @@
 }
 #endif
+
+
+/**
+ * Initiates the exported functions and MTE.
+ * @returns 0 on success.
+ *          -1 on failure.
+ */
+int krnlInit2(void)
+{
+    KLOGENTRY0("int");
+    int rc = krnlInitExports();
+    KLOGEXIT(rc);
+    return rc;
+}
 
 

tags/trunk/src/win32k/kKrnlLib/src/krnlLoadKernelSym.c ¶

@@ -1 @@
-/* $Id: krnlLoadKernelSym.c,v 1.1 2002-12-16 02:23:32 bird Exp $
+/* $Id: krnlLoadKernelSym.c,v 1.2 2002-12-19 01:49:08 bird Exp $
  *
  * Description:   Autoprobes the os2krnl file and os2krnl[*].sym files.
@@ -36 +36 @@
 #define NOFUNCTIONNAME
 #ifndef NOFILEID
-static const char szFileId[] = "$Id: krnlLoadKernelSym.c,v 1.1 2002-12-16 02:23:32 bird Exp $";
+static const char szFileId[] = "$Id: krnlLoadKernelSym.c,v 1.2 2002-12-19 01:49:08 bird Exp $";
 #endif
 
@@ -46 +46 @@
 #include <kLib/kDevHlp.h>
 #include <kLib/kLog.h>
+#include "devErrors.h"
+#include "options.h"
 #include "krnlImportTable.h"
+#define INCL_OS2KRNL_LDR
+#include "OS2Krnl.h"
 #include "krnlPrivate.h"
-#include "devErrors.h"
 
-#include "options.h"
-//#include "kKLkernel.h"
+
 
 #include <string.h>
@@ -101 +103 @@
     int         rc;
     int         i;
-    int         n;
     PGINFOSEG   pGIS;
     char        chBootDrive;
@@ -123 +124 @@
     if (szSymbolFile[0] != '\0')
     {
-        rc = krnlLoadKernelSymFile(szSymbolFile);
+        rc = krnlLoadKernelSymFile(szSymbolFile, pKrnlOTE, cKernelObjects);
         if (!rc)
-        {
-            //verify the loaded symfile.
-            //fixme
-        }
+            rc = krnlVerifyImportTab();
 
         if (rc)
@@ -138 +136 @@
         }
     }
+
+    /*
+     * Try the know locations.
+     */
     else
     {
-        /*
-         * Try the know locations.
-         */
         rc = ERROR_PROB_SYM_FILE_NOT_FOUND;
         for (i = 0; apszSym[i] != NULL; i++)
         {
-            int rc2 = krnlLoadKernelSymFile(apszSym[i]);
+            int rc2 = krnlLoadKernelSymFile(apszSym[i], pKrnlOTE, cKernelObjects);
             if (!rc2)
             {
-                //verify the loaded symfile.
-                //fixme
-                if (rc == ERROR_PROB_SYM_FILE_NOT_FOUND)
+                rc2 = krnlVerifyImportTab();
+                if (!rc || rc == ERROR_PROB_SYM_FILE_NOT_FOUND)
                 {
                     strcpy(szSymbolFile, apszSym[i]);
                     rc = rc2;
+                    if (!rc)
+                        break;
                 }
             }

tags/trunk/src/win32k/kKrnlLib/src/krnlLoadKernelSymFile.c ¶

@@ -1 @@
-/* $Id: krnlLoadKernelSymFile.c,v 1.1 2002-12-16 02:23:43 bird Exp $
+/* $Id: krnlLoadKernelSymFile.c,v 1.2 2002-12-19 01:49:08 bird Exp $
  *
  * Loads one kernel file into the import table.
@@ -24 +24 @@
  */
 
+#define NOFUNCTIONNAME
 #ifndef NOFILEID
-static const char szFileId[] = "$Id: krnlLoadKernelSymFile.c,v 1.1 2002-12-16 02:23:43 bird Exp $";
+static const char szFileId[] = "$Id: krnlLoadKernelSymFile.c,v 1.2 2002-12-19 01:49:08 bird Exp $";
 #endif
-
-
-/*******************************************************************************
-*   Defined Constants And Macros                                               *
-*******************************************************************************/
-/* "@#IBM:14.039#@    os2krnl... "*/
-/* "@#IBM:8.264#@    os2krnl... "*/
-#define KERNEL_ID_STRING_LENGTH  42
-#define KERNEL_READ_SIZE        512
-
 
 
@@ -42 +33 @@
 *   Header Files                                                               *
 *******************************************************************************/
+#include <kLib/kTypes.h>
+#include <kLib/kLog.h>
 #include <kLib/format/SYMdbg.h>
 #include "krnlImportTable.h"
-
-#include "os2krnl.h"                    /* must be included before dev1632.h! */
-#include "ProbKrnl.h"
-#include "ProbKrnlErrors.h"
-#include "dev16.h"
-#include "dev1632.h"
-#include "kkLlog.h"
-#include "options.h"
-#include "kKLInitHlp.h"
-#include "kKLkernel.h"
-#include "d16vprintf.h"
-#include "d16crt.h"
-
-
-/*******************************************************************************
-*   Global Variables                                                           *
-*******************************************************************************/
-/*
- * private data
- */
-static char *apszSym[] =
-{
-    {"c:\\os2krnl.sym"},                              /* usual for debugkernel */
-    {"c:\\os2\\pdpsi\\pmdf\\warp4\\os2krnlr.sym"},    /* warp 4 */
-    {"c:\\os2\\pdpsi\\pmdf\\warp4\\os2krnld.sym"},    /* warp 4 */
-    {"c:\\os2\\pdpsi\\pmdf\\warp4\\os2krnlb.sym"},    /* warp 4 */
-    {"c:\\os2\\pdpsi\\pmdf\\warp45_u\\os2krnlr.sym"}, /* warp 45 */
-    {"c:\\os2\\pdpsi\\pmdf\\warp45_u\\os2krnld.sym"}, /* warp 45 */
-    {"c:\\os2\\pdpsi\\pmdf\\warp45_u\\os2krnlb.sym"}, /* warp 45 */
-    {"c:\\os2\\pdpsi\\pmdf\\warp45_s\\os2krnlr.sym"}, /* warp 45 */
-    {"c:\\os2\\pdpsi\\pmdf\\warp45_s\\os2krnld.sym"}, /* warp 45 */
-    {"c:\\os2\\pdpsi\\pmdf\\warp45_s\\os2krnlb.sym"}, /* warp 45 */
-    {"c:\\os2\\system\\pmdf\\os2krnlr.sym"},          /* warp 3 ?*/
-    {"c:\\os2\\system\\pmdf\\os2krnld.sym"},          /* warp 3 ?*/
-    {"c:\\os2\\system\\pmdf\\os2krnlb.sym"},          /* warp 3 ?*/
-    {"c:\\os2\\system\\trace\\os2krnl.sym"},          /* warp 3 ?*/
-    {"c:\\os2krnlr.sym"},                             /* custom */
-    {"c:\\os2krnlb.sym"},                             /* custom */
-    {"c:\\os2krnld.sym"},                             /* custom */
-    NULL
-};
-
-/* Location of PMDF list of custom directories */
-static char szPmdfVers[] =
-    {"c:\\os2\\pdpsi\\pmdf\\pmdfvers.lst"};
-
-
-/*******************************************************************************
-*   Internal Functions                                                         *
-*******************************************************************************/
-/* Workers */
-int      LookupKrnlEntry(unsigned short usBuild, unsigned short fKernel, unsigned char cObjects);
-int      VerifyPrologs(void);
-int      ProbeSymFile(const char *pszFilename);
-int      GetKernelInfo(void);
-
-/* Ouput */
-void     ShowResult(int rc);
-
-/* Others used while debugging in R3. */
-int      VerifyKernelVer(void);
-int      ReadOS2Krnl(char *pszFilename);
-int      ReadOS2Krnl2(HFILE hKrnl, unsigned long  cbKrnl);
-
-
-
-/*******************************************************************************
-*   Implementation of Internal Helper Functions                                *
-*******************************************************************************/
-
-
-/*******************************************************************************
-*   Implementation Of The Important Functions                                  *
-*******************************************************************************/
-/**
- * Checks if this kernel is within the kernel symbol database.
- * If an entry for the kernel is found, the data is copied from the
- * database entry to aImportTab.
- * @returns   NO_ERROR on succes (0)
- *            1 if not found.
- *            Error code on error.
- * @param     usBuild       Build level.
- * @param     fKernel       Kernel (type) flags. (KF_* from options.h)
- * @param     cObjects      Count of object in the running kernel.
- * @sketch    Loop thru the table.
- * @status    completely implemented.
- * @author    knut st. osmundsen (knut.stange.osmundsen@mynd.no)
- */
-int LookupKrnlEntry(unsigned short usBuild, unsigned short fKernel, unsigned char cObjects)
-{
-#ifdef DB_16BIT
-    int i;
-
-    /*
-     * Loop tru the DB entries until a NULL pointer is found.
-     */
-    for (i = 0; aKrnlSymDB[i].usBuild != 0; i++)
-    {
-        if (   aKrnlSymDB[i].usBuild  == usBuild
-            && aKrnlSymDB[i].fKernel  == fKernel
-            && aKrnlSymDB[i].cObjects == cObjects)
-        {   /* found matching entry! */
-            int j;
-            int rc;
-            PKRNLDBENTRY pEntry = &aKrnlSymDB[i];
-
-            dprintf(("LookUpKrnlEntry - found entry for this kernel!\n"));
-            kstrcpy(szSymbolFile, "kKrnlLib Symbol Database");
-
-            /*
-             * Copy symbol data from the DB to aImportTab.
-             */
-            for (j = 0; j < NBR_OF_KRNLIMPORTS; j++)
-            {
-                aImportTab[j].offObject  = pEntry->aSyms[j].offObject;
-                aImportTab[j].iObject    = pEntry->aSyms[j].iObject;
-                aImportTab[j].chOpcode   = pEntry->aSyms[j].chOpcode;
-                aImportTab[j].ulAddress  = paKrnlOTEs[pEntry->aSyms[j].iObject].ote_base
-                                           + pEntry->aSyms[j].offObject;
-                aImportTab[j].usSel      = paKrnlOTEs[pEntry->aSyms[j].iObject].ote_sel;
-                aImportTab[j].fFound     = (char)((aImportTab[j].offObject != 0xFFFFFFFFUL) ? 1 : 0);
-
-                dprintf(("  %-3d addr=0x%08lx off=0x%08lx  %s\n",
-                         j, aImportTab[j].ulAddress, aImportTab[j].offObject,
-                         aImportTab[j].achName));
-            }
-
-            /* Verify prologs*/
-            rc = VerifyPrologs();
-
-            /* set sym name on success or complain on error */
-            if (rc != 0)
-            {
-                printf16("Warning: The kKrnlLib Symbol Database entry found.\n"
-                         "         But, VerifyPrologs() returned rc=0x%x and ordinal=%d\n", rc,
-                         iProc < NBR_OF_KRNLIMPORTS ? aImportTab[iProc].iOrdinal : 0xffff);
-                DosSleep(3000);
-            }
-
-            return rc;
-        }
-    }
-
-    /* not found */
-    return ERROR_PROB_SYMDB_KRNL_NOT_FOUND;
-#else
-
-    static LKE32PARAM   lke32Param;
-    APIRET          rc;
-    KKLR0INITPARAM  param;
-    KKLR0INITDATA   data;
-
-    lke32Param.usBuild  = usBuild;
-    lke32Param.fKernel  = fKernel;
-    lke32Param.cObjects = cObjects;
-
-    param.pfn = GetLookupKrnlEntry32Ptr();
-    param.ulParam = (ULONG)((USHORT)&lke32Param) + DATA16Base;
-    rc = DoDevIOCtl(&param, &data);
-    if (rc == NO_ERROR)
-    {
-        if (!data.ulRc)
-            kstrcpy(szSymbolFile, "kKrnlLib Symbol Database");
-        else
-        {
-            /* set the appropriate return values. */
-            rc = (USHORT)data.ulRc;
-            iProc = ((PUSHORT)&data.ulRc)[1];
-        }/* else success */
-    }
-    /* else: complaining has been done */
-
-    return rc;
-
-#endif
-}
-
-
-/**
- * Verifies the that the addresses in aImportTab are valid.
- * This is done at Ring-0 of course.
- * @returns     NO_ERROR (ie. 0) on success. iProc = -1
- *              The appropriate OS/2 or kKrnlLib return code on success. iProc
- *              is set to the failing procedure (if appliable).
- */
-int VerifyPrologs(void)
-{
-#if !defined(EXTRACT) && !defined(MKCALLTAB)
-    APIRET          rc;
-    KKLR0INITPARAM  param;
-    KKLR0INITDATA   data;
-    HFILE           hDev0 = 0;
-    USHORT          usAction = 0;
-
-    /* Set the failing procedure number to -1. */
-    iProc = -1;
-
-
-    param.pfn = GetVerifyImportTab32Ptr();
-    param.ulParam = 0;
-    rc = DoDevIOCtl(&param, &data);
-    if (rc == NO_ERROR)
-    {
-        if (data.ulRc != NO_ERROR)
-        {
-            /* set the appropriate return values. */
-            rc = (USHORT)data.ulRc;
-            iProc = ((PUSHORT)&data.ulRc)[1];
-        }/* else success */
-    }
-    /* else: complaining has been done */
-
-    return rc;
-#else
-    return 0;
-#endif
-}
+#include "devErrors.h"
+#include <os2def.h>
+#define INCL_OS2KRNL_LDR
+#include "os2krnl.h"
+
+#include <stdio.h>
+#include <string.h>
+
 
 
@@ -270 +54 @@
  * @remark    Error codes starts at -50.
  */
-int ProbeSymFile(const char * pszFilename)
+int krnlLoadKernelSymFile(const char *pszFilename, POTE paOTEs, int cOTEs)
 {
-    HFILE          hSym;                /* Filehandle */
+    //HFILE          hSym;                /* Filehandle */
+    FILE*          hSym;                /* Filehandle */
     int            cLeftToFind;         /* Symbols left to find */
     unsigned long  iSeg;                /* Outer search loop:  Segment number */
@@ -305 +90 @@
      * Now read header and display it.
      */
-    rc = fread(&MapDef, sizeof(MAPDEF), 1, hSym);
+    rc = fread(SSToDS(&MapDef), sizeof(MAPDEF), 1, hSym);
     if (!rc)
     {   /* oops! read failed, close file and fail. */
@@ -312 +97 @@
     }
     achBuffer[0] = MapDef.achModName[0];
-    fread(&achBuffer[1], 1, MapDef.cbModName, hSym);
+    fread(SSToDS(&achBuffer[1]), 1, MapDef.cbModName, hSym);
     achBuffer[MapDef.cbModName] = '\0';
     dprintf(("*Module name: %s\n", achBuffer));
-    dprintf(("*Segments: %d\n*MaxSymbolLength: %d\n", MapDef.cSegs, MapDef.cbMaxSym));
-    dprintf(("*ppNextMap: 0x%x\n", MapDef.ppNextMap ));
+    dprintf(("*Segments:    %d\n*MaxSymbolLength: %d\n", MapDef.cSegs, MapDef.cbMaxSym));
+    dprintf(("*ppNextMap:   0x%x\n", MapDef.ppNextMap ));
 
 
@@ -322 +107 @@
      * Verify that the modulename of the symbol file is OS2KRNL.
      */
-    if (MapDef.cbModName == 7 && kstrncmp(achBuffer, "OS2KRNL", 7) != 0)
+    if (MapDef.cbModName == 7 && strncmp(SSToDS(&achBuffer[0]), "OS2KRNL", 7) != 0)
     {   /* modulename was not OS2KRNL, fail. */
         dprintf(("Modulename verify failed\n"));
@@ -333 +118 @@
      * Verify that the number of segments is equal to the number objects in OS2KRNL.
      */
-    #if !defined(EXTRACT) && !defined(MKCALLTAB)
-    if (MapDef.cSegs != cObjects)
+    if (!cOTEs && MapDef.cSegs != cOTEs)
     {   /* incorrect count of segments. */
         dprintf(("Segment No. verify failed\n"));
@@ -340 +124 @@
         return ERROR_PROB_SYM_SEGS_NE_OBJS;
     }
-    #endif /* !EXTRACT && !MKCALLTAB */
 
 
@@ -374 +157 @@
     for (iSeg = 0; iSeg < MapDef.cSegs; iSeg++, offSegment = NEXTSEGDEFOFFSET(SegDef))
     {
-        int     fSegEPTBitType;         /* Type of segment, 16 or 32 bit, expressed in EPT_XXBIT flags */
         int     fCode;                  /* Set if this is a code segment, else clear. */
 
@@ -385 +167 @@
             return ERROR_PROB_SYM_SEG_DEF_SEEK;
         }
-        rc = fread(&SegDef, sizeof(SEGDEF), 1, hSym);
+        rc = fread(SSToDS(&SegDef), sizeof(SEGDEF), 1, hSym);
         if (!rc)
         {   /* Failed to read the segment definition, fail! */
@@ -396 +178 @@
          */
         achBuffer[0] = SegDef.achSegName[0];
-        fread(&achBuffer[1], 1, SegDef.cbSegName, hSym);
+        fread(SSToDS(&achBuffer[1]), 1, SegDef.cbSegName, hSym);
         achBuffer[SegDef.cbSegName] = '\0';
         dprintf(("Segment %.2li Flags=0x%02x cSymbols=0x%04x Name=%s\n",
@@ -402 +184 @@
 
         /*
-         * Determin segment bit type.
+         * Code segment?
          */
-        fSegEPTBitType = SEG32BitSegment(SegDef) ? EPT_32BIT : EPT_16BIT;
-        fCode = kstrstr(achBuffer, "CODE") != NULL;
+        fCode = strstr(achBuffer, "CODE") != NULL;
 
         /*
@@ -428 +209 @@
                 continue;
             }
-            rc = fread(&offSym, sizeof(unsigned short int), 1, hSym);
+            rc = fread(SSToDS(&offSym), sizeof(offSym), 1, hSym);
             if (!rc)
             {   /* Symboloffset read failed, try read next symbol. */
@@ -445 +226 @@
              * Read symbol and symbolname.
              */
-            if (SegDef.bFlags & 0x01)
-                rc = fread(&SymDef32, sizeof(SYMDEF32), 1, hSym);
+            if (SEG32BitSegment(SegDef))
+            {
+                rc = fread(SSToDS(&SymDef32), sizeof(SYMDEF32), 1, hSym);
+                achBuffer[0] = SymDef32.achSymName[0];
+                cchName      = SymDef32.cbSymName;
+            }
             else
-                rc = fread(&SymDef16, sizeof(SYMDEF16), 1, hSym);
+            {
+                rc = fread(SSToDS(&SymDef16), sizeof(SYMDEF16), 1, hSym);
+                achBuffer[0] = SymDef16.achSymName[0];
+                cchName      = SymDef16.cbSymName;
+            }
             if (!rc)
             {   /* Symbol read failed, try read next symbol */
@@ -454 +243 @@
                 continue;
             }
-            achBuffer[0] = (SegDef.bFlags & 0x01) ? SymDef32.achSymName[0] : SymDef16.achSymName[0];
-            cchName = (SegDef.bFlags & 0x01) ? SymDef32.cbSymName : SymDef16.cbSymName;
-            rc = fread(&achBuffer[1], 1, cchName, hSym);
+            rc = fread(SSToDS(&achBuffer[1]), 1, cchName, hSym);
             if (!rc)
             {   /* Symbol read failed, try read next symbol */
@@ -473 +260 @@
                     && (pImport->fType & EPT_VAR ? !fCode : fCode)         /* Don't look for code in a data segment */
                     && pImport->cchName == cchName                         /* Equal name length */
-                    && kstrncmp(pImport->achName, achBuffer, cchName) == 0 /* Equal name */
+                    && strncmp(pImport->achName, SSToDS(&achBuffer[0]), cchName) == 0  /* Equal name */
                     )
                 {   /* Symbol was found */
-                    pImport->offObject = (SegDef.bFlags & 0x01 ? SymDef32.wSymVal : SymDef16.wSymVal);
-                    pImport->ulAddress = pImport->offObject + paKrnlOTEs[iSeg].ote_base;
+                    pImport->offObject = SEG32BitSegment(SegDef) ? SymDef32.wSymVal : SymDef16.wSymVal;
                     pImport->iObject   = (unsigned char)iSeg;
-                    pImport->usSel     = paKrnlOTEs[iSeg].ote_sel;
-                    dprintf(("debug: base=%lx, size=%lx iSeg=%d\n", paKrnlOTEs[iSeg].ote_base, paKrnlOTEs[iSeg].ote_size, iSeg));
+                    pImport->ulAddress = pImport->offObject + (paOTEs ? paOTEs[iSeg].ote_base : 0);
+                    pImport->usSel     = (unsigned short)(paOTEs ? paOTEs[iSeg].ote_sel : 0);
 
                     /* Paranoia test! */
-                    #if !defined(EXTRACT) && !defined(MKCALLTAB)
-                    if (pImport->offObject < paKrnlOTEs[iSeg].ote_size)
+                    if (!paOTEs || pImport->offObject < paOTEs[iSeg].ote_size)
                     {
                         pImport->fFound = TRUE;
@@ -494 +279 @@
                     else/* test failed, continue on next symbol*/
                         dprintf(("Error: Paranoia test failed for %s\n", pImport->achName));;
-                    #else
-                    pImport->fFound = TRUE;
-                    cLeftToFind--;
-                    #endif /* !EXTRACT */
                     break;
                 }
@@ -520 +301 @@
 
     /*
-     * Verify function prologs and return.
-     */
-    return VerifyPrologs();
+     * Symbols successfully loaded.
+     */
+    return 0;
 }
 
-
-/**
- * Get kernelinformation (OTEs (object table entries), build, type, debug...)
- * @returns 0 on success.
- *              ulKernelBuild, fchType, fDebug, cObjects and paKrnlOTEs is set on successful return.
- *          Not 0 on error.
- */
-int   GetKernelInfo(void)
-{
-#if !defined(EXTRACT) && !defined(MKCALLTAB) /* This IOCtl is not available after inittime! */
-    static KRNLINFO DATA16_INIT KrnlInfo = {0};
-    APIRET          rc;
-    KKLR0INITPARAM  param;
-    KKLR0INITDATA   data;
-
-    /*
-     * Issue an IOCtl to kKrnlHlp to query kernel information.
-     */
-    param.pfn = GetGetKernelInfo32Ptr();
-    param.ulParam = (ULONG)((USHORT)&KrnlInfo) + DATA16Base;
-    rc = DoDevIOCtl(&param, &data);
-    if (rc == NO_ERROR)
-    {
-        if (!data.ulRc)
-        {
-            #ifdef DEBUG
-            unsigned i;
-            #endif
-
-            /*
-             * Set the exported parameters
-             */
-            ulKernelBuild   = KrnlInfo.ulBuild;
-            fKernel         = KrnlInfo.fKernel;
-            cObjects        = KrnlInfo.cObjects;
-            paKrnlOTEs      = &KrnlInfo.aObjects[0];
-
-            /*
-             * If debugging probkrnl dump kernel OTEs.
-             */
-            #ifdef DEBUG
-            dprintf(("debug: kernel OTE:\n"));
-            for (i = 0; i < cObjects; i++)
-                dprintf(("debug: no.%2d base=%lx size=%lx sel=%x\n",
-                         i,
-                         paKrnlOTEs[i].ote_base,
-                         paKrnlOTEs[i].ote_size,
-                         paKrnlOTEs[i].ote_sel));
-            #endif
-        }
-        else
-            rc = (USHORT)data.ulRc;
-    }
-    /*else: complaining has been done */
-
-    return rc;
-
-#else
-    return 0;
-#endif
-}
-
-
-/**
- * Shows result of kernelprobing if not quiet or on error.
- * @param   rc      Return code.
- */
-void ShowResult(int rc)
-{
-    int i;
-
-    /*
-     * Complain even if quiet on error
-     */
-    if (!options.fQuiet || rc != NO_ERROR)
-    {
-        printf16("\nkKrnlLib - Odin32 Ring-0 Kernel Library. (Built %s %s)\n",
-                 (NPSZ)szBuildTime, (NPSZ)szBuildDate);
-
-        /*
-         * kernel stuff
-         */
-        printf16("    Kernel Build:     ");
-        if (rc == NO_ERROR || rc > ERROR_PROB_KRNL_LAST)
-            printf16("%ld - v%d.%d\n",
-                     ulKernelBuild, usVerMajor, usVerMinor);
-        else if (rc >= ERROR_PROB_KRNL_FIRST)
-            printf16("Kernel probing failed with rc=%d.\n", rc);
-        else
-            printf16("Failed before probing kernel.\n");
-
-        /*
-         * symbol-file
-         */
-        printf16("    Using symbolfile: ");
-        if (rc == NO_ERROR || (rc > ERROR_PROB_SYM_LAST && szSymbolFile[0] != '\0'))
-            printf16("%s\n", (NPSZ)szSymbolFile);
-        else if (rc >= ERROR_PROB_SYM_FIRST)
-            printf16("Failed to find symbolfile!\n");
-        else
-            printf16("Failed before searching for symbolfile.\n");
-
-        /*
-         * function listing
-         */
-        if (options.fLogging)/* || rc != NO_ERROR)*/
-        {
-            for (i = 0; i < NBR_OF_KRNLIMPORTS; i++)
-                if (aImportTab[i].fFound)
-                    break;
-
-            if (i < NBR_OF_KRNLIMPORTS)
-            {
-                for (i = 0; i < NBR_OF_KRNLIMPORTS; i++)
-                {
-                    printf16("  %-21s at ", aImportTab[i].achName);
-                    if (aImportTab[i].fFound)
-                        printf16("0x%08lx%s", aImportTab[i].ulAddress, (i % 2) == 0 ? "" : "\n");
-                    else
-                        printf16("not found!%s", (i % 2) == 0 ? "" : "\n");
-                }
-                if (i % 2) printf16("\n");
-            }
-            else
-                printf16("Error: No functions was found!\n");
-        }
-
-        /*
-         * Display error code.
-         */
-        if (rc != NO_ERROR)
-        {
-            if (iProc >= 0)
-                printf16("Error: ProbeKernel failed with rc=0x%x. ordinal=%d(%s)\n",
-                         rc,
-                         iProc < NBR_OF_KRNLIMPORTS ? aImportTab[iProc].iOrdinal : 0xffff,
-                         iProc < NBR_OF_KRNLIMPORTS ? aImportTab[iProc].achName : "");
-            else
-                printf16("Error: ProbeKernel failed with rc=0x%x.\n", rc);
-        }
-    }
-}
-
-
-/**
- * "main" function.
- * Note that the option -Noloader causes nothing to be done.
- * @returns   0 on success, something else on error.
- * @param     pReqPack  Pointer to init request packet
- * @remark
- */
-/**
- * This function will loop thru all possible kernel
- * sym files and try match them with the loaded kernel.
- *
- * @returns 0 on success.
- *          The kernel import table contains valid data.
- * @returns error code on failure. Upper part contains failed proc.
- *          The kernel import table contains invalid data.
- * @sketch
- * @modifies szSymbolFile, aImportTab.
- *
- */
-int krnlLoadKernelSym(void)
-{
-    int         rc;
-    int         i;
-    int         n;
-    APIRET      rc2;
-    PGINFOSEG   pGIS;
-    char        chBootDrive;
-    HFILE       hPmdfVers;
-
-    /*
-     * Determin boot drive and update the table.
-     * Note! Make sure the strings are not readonly const!
-     */
-    pGIS = kDH_GetDosVar(DHGETDOSV_SYSINFOSEG, 0);
-    if (!pGIS)
-        return ERROR_PROB_KRNL_GIS;
-    dprintf(("BootDrive: %d\n", pGIS->bootdrive));
-
-    chBootDrive = (char)pGIS->bootdrive + (char)'a' - 1;
-    for (i = 0; apszSym[i] != NULL; i++)
-        apszSym[i][0] = chBootDrive;
-
-    /*
-     * If symfile was specified, we will try read it.
-     */
-    rc = 1;
-    if (szSymbolFile[0] != '\0')
-    {
-
-        rc = ProbeSymFile(szSymbolFile);
-        if (rc)
-        {
-            printf16("Warning: Invalid symbol file specified. rc=%x ordinal=%d\n"
-                     "         Tries defaults.\n",
-                     rc,
-                     iProc < NBR_OF_KRNLIMPORTS ? aImportTab[iProc].iOrdinal : 0xffff);
-            szSymbolFile[0] = '\0';
-            DosSleep(3000);
-        }
-    }
-
-        if (rc) /* if user sym failed or don't exists. */
-        {
-            /*
-             * Check database - only if not a debug kernel!
-             * You usually have a .sym-file when using a debug kernel.
-             */
-            if ((fKernel & KF_DEBUG) ||
-                (rc = LookupKrnlEntry((unsigned short)ulKernelBuild,
-                                      (unsigned short)fKernel,
-                                      cObjects)
-                 ) != NO_ERROR
-                )
-            {
-                /* search on disk */
-                i = 0;
-                while (apszSym[i] != NULL
-                       && (rc2 = ProbeSymFile(apszSym[i])) != NO_ERROR
-                       )
-                {
-                    i++;
-                    if (rc2 >= ERROR_D32_FIRST)
-                        rc = rc2;
-                }
-                if (rc2 == NO_ERROR)
-                {
-                    kstrcpy(szSymbolFile, apszSym[i]);
-                    rc = NO_ERROR;
-                }
-            }
-        }
-
-    /* Show the result and set return-value */
-    dprintf(("rc=%d(0x%x); i=%d; Ordinal=%d\n",
-             rc, rc, i, iProc < NBR_OF_KRNLIMPORTS ? aImportTab[iProc].iOrdinal : 0xffff));
-    ShowResult(rc);
-
-    return rc;
-}
-
-
-

tags/trunk/src/win32k/kKrnlLib/src/krnlLockedWrite.asm ¶

@@ -1 @@
-; $Id: krnlLockedWrite.asm,v 1.1 2002-03-10 02:45:55 bird Exp $
+; $Id: krnlLockedWrite.asm,v 1.2 2002-12-19 01:49:09 bird Exp $
 ;
 ; Locked Write functions used by krnlImport to overload
@@ -10 +10 @@
     .386p
 
-;
-;   Header Files
-;
+
+;*******************************************************************************
+;* Header Files                                                                *
+;*******************************************************************************
 include devSegDf.inc
 
 
+;*******************************************************************************
+;* Exported Symbols                                                            *
+;*******************************************************************************
+public krnlLockedWrite
 
 
@@ -31 +36 @@
 ; @uses     eax, edx, ecx
 ; @author   knut st. osmundsen (kosmunds@csc.com)
-LockedWrite proc near
+krnlLockedWrite proc near
     push    ebx                         ; Save ebx accoring to _Optlink.
     pushfd                              ; Save flags so we restore interrupts correctly.
@@ -66 +71 @@
     xor     eax, eax                    ; How could we fail?
     ret
-LockedWrite endp
+krnlLockedWrite endp
 
 

tags/trunk/src/win32k/kKrnlLib/src/krnlOverloading.c ¶

@@ -1 @@
-/* $Id: krnlOverloading.c,v 1.2 2002-03-31 19:01:16 bird Exp $
- *
- * Overloading routines.
- *
- * Copyright (c) 2001 knut st. osmundsen (kosmunds@csc.com)
- *
- * Project Odin Software License can be found in LICENSE.TXT
- *
- */
+/* $Id: krnlOverloading.c,v 1.3 2002-12-19 01:49:09 bird Exp $
+ *
+ * Interfaces for overloading kernel routines.
+ *
+ * Copyright (c) 2001-2001 knut st. osmundsen <bird@anduin.net>
+ *
+ *
+ * This file is part of kKrnlLib.
+ *
+ * kKrnlLib is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * kKrnlLib is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with kKrnlLib; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
 #ifndef NOFILEID
-static const char szFileId[] = "$Id: krnlOverloading.c,v 1.2 2002-03-31 19:01:16 bird Exp $";
+static const char szFileId[] = "$Id: krnlOverloading.c,v 1.3 2002-12-19 01:49:09 bird Exp $";
 #endif
 
@@ -16 +32 @@
 *   Header Files                                                               *
 *******************************************************************************/
-#define INCL_DOSERRORS
-#define INCL_NOPMAPI
-#include <os2.h>
+#include <kLib/kTypes.h>
 
 #define INCL_OS2KRNL_ALL
@@ -28 +42 @@
 #include "kKrnlLib.h"
 
-#include "devSegDf.h"
-#include "dev32.h"
-#include "ProbKrnl.h"
+#include "krnlImportTable.h"
 #include "krnlPrivate.h"
 
@@ -187 +199 @@
  * @author  knut st. osmundsen (kosmunds@csc.com)
  */
-BOOL kKLOverload32(ULONG ulFuncAddr, ULONG ulOverloaderAddr)
-{
-    KLOGENTRY2("BOOL","ULONG ulFuncAddr, ULONG ulOverloaderAddr", ulFuncAddr, ulOverloaderAddr);
+KBOOL kKLOverload32(ULONG ulFuncAddr, ULONG ulOverloaderAddr)
+{
+    KLOGENTRY2("KBOOL","ULONG ulFuncAddr, ULONG ulOverloaderAddr", ulFuncAddr, ulOverloaderAddr);
     int     iFunc;
 
@@ -220 +232 @@
      * Overload the function.
      */
-    LockedWrite(ulFuncAddr, 0xe9, ulOverloaderAddr - ulFuncAddr + 5);
+    krnlLockedWrite(ulFuncAddr, 0xe9, ulOverloaderAddr - ulFuncAddr + 5);
 
     IMPORT_UNLOCK();
@@ -239 +251 @@
  * @author  knut st. osmundsen (kosmunds@csc.com)
  */
-BOOL kKLRestore32(ULONG ulFuncAddr, ULONG ulOverloaderAddr)
-{
-    KLOGENTRY2("BOOL","ULONG ulFuncAddr, ULONG ulOverloaderAddr", ulFuncAddr, ulOverloaderAddr);
+KBOOL kKLRestore32(ULONG ulFuncAddr, ULONG ulOverloaderAddr)
+{
+    KLOGENTRY2("KBOOL","ULONG ulFuncAddr, ULONG ulOverloaderAddr", ulFuncAddr, ulOverloaderAddr);
     int     iFunc;
     char *  pchOrgProlog;
@@ -289 +301 @@
      * Restore function prolog.
      */
-    LockedWrite(ulFuncAddr, *pchOrgProlog, *(unsigned long *)(void*)(pchOrgProlog + 1));
+    krnlLockedWrite(ulFuncAddr, *pchOrgProlog, *(unsigned long *)(void*)(pchOrgProlog + 1));
 
     IMPORT_UNLOCK();
@@ -306 +318 @@
  * @author  knut st. osmundsen (kosmunds@csc.com)
  */
-BOOL kKLOverload16(ULONG ulFuncFarAddr, ULONG ulOverloaderFarAddr)
-{
-    KLOGENTRY2("BOOL","ULONG ulFuncFarAddr, ULONG ulOverloaderFarAddr", ulFuncFarAddr, ulOverloaderFarAddr);
+KBOOL kKLOverload16(ULONG ulFuncFarAddr, ULONG ulOverloaderFarAddr)
+{
+    KLOGENTRY2("KBOOL","ULONG ulFuncFarAddr, ULONG ulOverloaderFarAddr", ulFuncFarAddr, ulOverloaderFarAddr);
     int     iFunc;
 
@@ -340 +352 @@
      * Overload the function.
      */
-    LockedWrite(aImportTab[iFunc].ulAddress, 0xea, ulOverloaderFarAddr);
+    krnlLockedWrite(aImportTab[iFunc].ulAddress, 0xea, ulOverloaderFarAddr);
 
     IMPORT_UNLOCK();
@@ -358 +370 @@
  * @remark  Currently not supported.
  */
-BOOL kKLRestore16(ULONG ulFuncFarAddr, ULONG ulOverloaderFarAddr)
-{
-    KLOGENTRY2("BOOL","ULONG ulFuncFarAddr, ULONG ulOverloaderFarAddr", ulFuncFarAddr, ulOverloaderFarAddr);
+KBOOL kKLRestore16(ULONG ulFuncFarAddr, ULONG ulOverloaderFarAddr)
+{
+    KLOGENTRY2("KBOOL","ULONG ulFuncFarAddr, ULONG ulOverloaderFarAddr", ulFuncFarAddr, ulOverloaderFarAddr);
     int     iFunc;
     char *  pchOrgProlog;
@@ -410 +422 @@
      * Restore function prolog.
      */
-    LockedWrite(aImportTab[iFunc].ulAddress, *pchOrgProlog, *(unsigned long *)(void*)(pchOrgProlog + 1));
+    krnlLockedWrite(aImportTab[iFunc].ulAddress, *pchOrgProlog, *(unsigned long *)(void*)(pchOrgProlog + 1));
 
     IMPORT_UNLOCK();
@@ -428 +440 @@
  * @remark  Currently not supported.
  */
-BOOL kKLOverload16H(ULONG ulFuncFarAddr, ULONG ulOverloaderFarAddr)
-{
-    KLOGENTRY2("BOOL","ULONG ulFuncFarAddr, ULONG ulOverloaderFarAddr", ulFuncFarAddr, ulOverloaderFarAddr);
+KBOOL kKLOverload16H(ULONG ulFuncFarAddr, ULONG ulOverloaderFarAddr)
+{
+    KLOGENTRY2("KBOOL","ULONG ulFuncFarAddr, ULONG ulOverloaderFarAddr", ulFuncFarAddr, ulOverloaderFarAddr);
     kprintf(("not supported currently\n"));
     KNOREF(ulFuncFarAddr);
@@ -438 +450 @@
 }
 
+
 /**
  * Restores a overloaded hybrid 16-bit function.
@@ -447 +460 @@
  * @remark  Currently not supported.
  */
-BOOL kKLRestore16H(ULONG ulFuncFarAddr, ULONG ulOverloaderFarAddr)
-{
-    KLOGENTRY2("BOOL","ULONG ulFuncFarAddr, ULONG ulOverloaderFarAddr", ulFuncFarAddr, ulOverloaderFarAddr);
+KBOOL kKLRestore16H(ULONG ulFuncFarAddr, ULONG ulOverloaderFarAddr)
+{
+    KLOGENTRY2("KBOOL","ULONG ulFuncFarAddr, ULONG ulOverloaderFarAddr", ulFuncFarAddr, ulOverloaderFarAddr);
     kprintf(("not supported currently\n"));
     KNOREF(ulFuncFarAddr);

tags/trunk/src/win32k/kKrnlLib/src/krnlPrologs.c ¶

@@ -1 @@
-/* $Id: krnlPrologs.c,v 1.2 2002-12-16 02:24:29 bird Exp $
+/* $Id: krnlPrologs.c,v 1.3 2002-12-19 01:49:09 bird Exp $
  *
  * krnlPrologs - Kernel Prolog Recognizer.
@@ -25 +25 @@
 
 #ifndef NOFILEID
-static const char szFileId[] = "$Id: krnlPrologs.c,v 1.2 2002-12-16 02:24:29 bird Exp $";
+static const char szFileId[] = "$Id: krnlPrologs.c,v 1.3 2002-12-19 01:49:09 bird Exp $";
 #endif
 
@@ -118 +118 @@
  * @param     pach       Pointer to prolog.
  */
-int interpretFunctionProlog32(char *pach)
+int krnlInterpretProlog32(char *pach)
 {
     KLOGENTRY1("int","char * pach", pach);
@@ -440 +440 @@
  * @param     pach       Pointer to prolog.
  */
-int interpretFunctionProlog16(char *pach)
+int krnlInterpretProlog16(char *pach)
 {
     KLOGENTRY1("int","char * pach", pach);

tags/trunk/src/win32k/kKrnlLib/src/krnlStubs.c ¶

@@ -1 @@
-/* $Id: krnlStubs.c,v 1.1 2002-03-10 02:45:56 bird Exp $
+/* $Id: krnlStubs.c,v 1.2 2002-12-19 01:49:09 bird Exp $
  *
  * krnlStubs - Stubs for not-required (NR) imported functions and variables.
  *
- * Copyright (c) 2000-2001 knut st. osmundsen (kosmunds@csc.com)
+ * Copyright (c) 2000-2003 knut st. osmundsen <bird@anduin.net>
  *
- * Project Odin Software License can be found in LICENSE.TXT
+ *
+ * This file is part of kKrnlLib.
+ *
+ * kKrnlLib is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * kKrnlLib is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with kKrnlLib; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
+
 #ifndef NOFILEID
-static const char szFileId[] = "$Id: krnlStubs.c,v 1.1 2002-03-10 02:45:56 bird Exp $";
+static const char szFileId[] = "$Id: krnlStubs.c,v 1.2 2002-12-19 01:49:09 bird Exp $";
 #endif
 
@@ -16 +32 @@
 *   Header Files                                                               *
 *******************************************************************************/
-#define INCL_DOSERRORS
-#define INCL_NOPMAPI
-#include <os2.h>
-
 #define INCL_OS2KRNL_ALL
 #define INCL_OS2KRNL_LDR
@@ -27 +39 @@
 #define INCL_KKL_LOG
 #include "kKrnlLib.h"
-
-
-PSZ SECCALL     nopSecPathFromSFN(SFN hFile);
 
 

tags/trunk/src/win32k/kKrnlLib/src/krnlWrappers.asm ¶

@@ -1 @@
-; $Id: krnlWrappers.asm,v 1.1 2002-04-01 12:33:28 bird Exp $
+; $Id: krnlWrappers.asm,v 1.2 2002-12-19 01:49:09 bird Exp $
 ;
 ; Wrappers - assembly wrappers for kernel function which have been changed radically.
 ;
-; Copyright (c) 2000-2002 knut st. osmundsen (bird@anduin.net)
+; Copyright (c) 2000-2003 knut st. osmundsen <bird@anduin.net>
 ;
-; Project Odin Software License can be found in LICENSE.TXT
+;
+; This file is part of kKrnlLib.
+;
+; kKrnlLib is free software; you can redistribute it and/or modify
+; it under the terms of the GNU General Public License as published by
+; the Free Software Foundation; either version 2 of the License, or
+; (at your option) any later version.
+;
+; kKrnlLib is distributed in the hope that it will be useful,
+; but WITHOUT ANY WARRANTY; without even the implied warranty of
+; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+; GNU General Public License for more details.
+;
+; You should have received a copy of the GNU General Public License
+; along with kKrnlLib; if not, write to the Free Software
+; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+;
 ;
     .386p
 
-;
-; Include files
-;
-    include devsegdf.inc
+;*******************************************************************************
+;* Header Files                                                                *
+;*******************************************************************************
+include devsegdf.inc
 
-;
-; Exported symbols
-;
-    public _ldrOpenPath@20
 
-;
-; Externs
-;
-    extrn _ldrOpenPath_wrapped:PROC            ; calltab entry
-    extrn _ulKernelBuild:DWORD
+;*******************************************************************************
+;* Exported Symbols                                                            *
+;*******************************************************************************
+public _ldrOpenPath@20
+
+
+;*******************************************************************************
+;* Global Variables                                                            *
+;*******************************************************************************
+extrn _ldrOpenPath_wrapped:PROC         ; calltab entry
+extrn _ulKernelBuild:DWORD
 
 

tags/trunk/src/win32k/kKrnlLib/tools/Makefile ¶

@@ -1 @@
-# $Id: Makefile,v 1.3 2002-08-22 02:09:43 bird Exp $
+# $Id: Makefile,v 1.4 2002-12-19 01:49:10 bird Exp $
 
 #
@@ -17 +17 @@
 #
 TARGET_NAME     = clfix
-TARGET_PUBNAME  = $(PATH_TOOLS)\$(TARGET_NAME).$(TARGET_EXT)
+TARGET_PUB_DIR  = $(PATH_TOOLS)
 TARGET_NEEDED   = 1
 ALL_INCLUDES    = -I../include
-POSTMAKEFILES   = ignore.mak libconv.mak
+POSTMAKEFILES_NEEDED   = ignore.mak libconv.mak
 
 #

tags/trunk/src/win32k/kKrnlLib/tools/ignore.mak ¶

@@ -1 @@
-# $Id: ignore.mak,v 1.4 2002-08-22 03:07:50 bird Exp $
+# $Id: ignore.mak,v 1.5 2002-12-19 01:49:10 bird Exp $
 
 #
@@ -18 +18 @@
 #
 TARGET_NAME     = ignore
-TARGET_PUBNAME  = $(PATH_TOOLS)\$(TARGET_NAME).$(TARGET_EXT)
+TARGET_PUB_DIR  = $(PATH_TOOLS)
 TARGET_NEEDED   = 1
 ALL_INCLUDES    = -I../include

tags/trunk/src/win32k/kKrnlLib/tools/kDevTest/kDevTest.vpj ¶

@@ -25 +25 @@
 [ASSOCIATION]
 [STATE]
-SCREEN: 1600 1280 880 21 1094 1233 0 0 M 0 0 0 0 1591 953
-CWD: G:\Odin32\Tree\src\win32k\kKrnlLib\tools\kDevTest
-BUFFER: BN="F:\VSLICK40\OS2\vrestore.slk"
-BI: MA=1 254 1  TABS=1 9  WWS=3 IWT=0 ST=0 IN=0 BW=0 US=0 RO=0 SE=0 SN=0 BIN=0 MN=Fundamental   HM=0 MF=1
-VIEW: LN=.0 CL=1 LE=0 CX=0 CY=1 WI=5 BI=4 HT=0 HN=0 HF=0 HC=4
-BUFFER: BN="G:\odin32\tree\src\win32k\kKrnlLib\tools\kDevTest\kdtDevHelp.asm"
-BI: MA=1 74 1  TABS=1 5  WWS=1 IWT=0 ST=0 IN=1 BW=0 US=32000 RO=0 SE=1 SN=0 BIN=0 MN=Assembly   HM=0 MF=872
-VIEW: LN=.16763 CL=5 LE=0 CX=4 CY=40 WI=5 BI=19 HT=0 HN=0 HF=0 HC=4
-WINDOW: 0 -4 1073 645 -1 -1 M  WF=0 WT=2 "System VIO,12,0,1"
-BUFFER: BN="G:\odin32\tree\src\win32k\kKrnlLib\tools\kDevTest\kdtDevHelp.asm"
-VIEW: LN=.18570 CL=2 LE=0 CX=1 CY=40 WI=88 BI=19 HT=0 HN=0 HF=0 HC=4
+SCREEN: 1600 1280 501 31 1094 1233 0 0 N 0 0 0 0 1077 928
+CWD: G:\src\mozilla\tree
+BUFFER: BN="G:\kBuild\tree\src\kShell\kShell.c"
+BI: MA=1 74 1  TABS=1 9  WWS=1 IWT=0 ST=0 IN=2 BW=0 US=32000 RO=0 SE=1 SN=0 BIN=0 MN=C  HM=0 MF=864
+VIEW: LN=.0 CL=1 LE=0 CX=0 CY=1 WI=5 BI=19 HT=0 HN=0 HF=0 HC=4
+WINDOW: 0 -4 726 629 -1 -1 M  WF=0 WT=2 "System VIO,12,0,1"
+BUFFER: BN="G:\kBuild\tree\src\kShell\kShell.c"
+VIEW: LN=.13450 CL=1 LE=0 CX=0 CY=40 WI=88 BI=19 HT=0 HN=0 HF=0 HC=4
 FILEHIST: 9
-G:\UNIMAC\TREE\GPL\DevInitBase.c
-G:\UNIMAC\TREE\GPL\hello.s
-G:\UNIMAC\TREE\make\setup.os2debvac308.mk
-G:\UNIMAC\TREE\GPL\DevHelp32\DH32GetDOSVar.asm
-G:\UNIMAC\TREE\GPL\DevStackA.asm
-G:\UNIMAC\TREE\GPL\DevStrategyA.asm
-G:\UNIMAC\TREE\ChangeLog
-G:\odin32\tree\src\win32k\kKrnlLib\tools\kDevTest\kdtDevHelp.asm
-f:\ddk\april02\base\inc\devhlp.inc
+G:\php\tree\ChangeLog.OS2
+G:\kTaskMgr\Tree\Generic\src\kLib\files
+G:\kBuild\tree\doc\docdesign.c
+G:\kBuild\tree\doc\kmkdocs.c
+G:\kBuild\tree\src\kmk\kShell\kShell.c
+G:\kBuild\tree\src\kmk\kShell\kShell.h
+G:\kBuild\tree\src\kShell\kShellMain.c
+G:\kBuild\tree\src\kShell\kShell.h
+G:\kBuild\tree\src\kShell\kShell.c
 PRINTER: 2
 PRINTER: 2

tags/trunk/src/win32k/kKrnlLib/tools/libconv.mak ¶

@@ -1 @@
-# $Id: libconv.mak,v 1.3 2002-08-22 02:09:44 bird Exp $
+# $Id: libconv.mak,v 1.4 2002-12-19 01:49:10 bird Exp $
 
 #
@@ -17 +17 @@
 #
 TARGET_NAME     = libconv
-TARGET_PUBNAME  = $(PATH_TOOLS)\$(TARGET_NAME).$(TARGET_EXT)
+TARGET_PUB_DIR  = $(PATH_TOOLS)
 TARGET_NEEDED   = 1
 ALL_INCLUDES    = -I../include