Ignore:
Timestamp:
Sep 4, 2000, 6:40:50 PM (25 years ago)
Author:
bird
Message:

Corrected FATAL error in k32QueryOptionsStatus.cpp. (Forgot SSToDS...)
Improved error messages during init.

Location:
trunk/src/win32k/include
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/win32k/include/dev16.h

    r4164 r4185  
    1 /* $Id: dev16.h,v 1.9 2000-09-02 21:08:00 bird Exp $
     1/* $Id: dev16.h,v 1.10 2000-09-04 16:40:50 bird Exp $
    22 * dev16 - 16-bit specific. Should not be used in 32-bit C/C++.
    33 *
     
    2828typedef struct _D16R0INITDATA
    2929{
    30     USHORT Status;
     30    USHORT usRcInit32;
    3131} D16R0INITDATA;
    3232typedef D16R0INITDATA FAR *PD16R0INITDATA;
     
    4949 */
    5050#define D16_IOCTL_VERIFYIMPORTTAB   0x42
     51typedef struct _D16VERIFYIMPORTTABDATA
     52{
     53    USHORT usRc;
     54} D16VERIFYIMPORTTABDATA;
     55typedef D16VERIFYIMPORTTABDATA FAR *PD16VERIFYIMPORTTABDATA;
    5156
    5257
  • trunk/src/win32k/include/errors.h

    r4164 r4185  
    1 /* $Id: errors.h,v 1.2 2000-09-02 21:08:01 bird Exp $
     1/* $Id: errors.h,v 1.3 2000-09-04 16:40:50 bird Exp $
    22 *
    33 * Error definitions for Win32k.sys
     
    5454#define ERROR_PROB_SYM_SEG_DEF_SEEK                 (ERROR_PROB_BASE + 34)
    5555#define ERROR_PROB_SYM_SEG_DEF_READ                 (ERROR_PROB_BASE + 35)
    56 #define ERROR_PROB_SYM_VERIFY_FIRST                 (ERROR_PROB_BASE + 36)
    57 #define ERROR_PROB_SYM_V_PROC_NOT_FND               (ERROR_PROB_SYM_VERIFY_FIRST + ERROR_D32_PROC_NOT_FOUND      - ERROR_D32_VERIFYIMPORTTAB_FIRST)
    58 #define ERROR_PROB_SYM_V_OBJ_OR_ADDR                (ERROR_PROB_SYM_VERIFY_FIRST + ERROR_D32_INVALID_OBJ_OR_ADDR - ERROR_D32_VERIFYIMPORTTAB_FIRST)
    59 #define ERROR_PROB_SYM_V_ADDRESS                    (ERROR_PROB_SYM_VERIFY_FIRST + ERROR_D32_INVALID_ADDRESS     - ERROR_D32_VERIFYIMPORTTAB_FIRST)
    60 #define ERROR_PROB_SYM_V_PROLOG                     (ERROR_PROB_SYM_VERIFY_FIRST + ERROR_D32_TOO_INVALID_PROLOG  - ERROR_D32_VERIFYIMPORTTAB_FIRST)
    61 #define ERROR_PROB_SYM_V_NOT_IMPL                   (ERROR_PROB_SYM_VERIFY_FIRST + ERROR_D32_NOT_IMPLEMENTED     - ERROR_D32_VERIFYIMPORTTAB_FIRST)
    62 /* - reserved for future errors - *
    63 #define ERROR_PROB_SYM_                             (ERROR_PROB_BASE + 41)
    64 #define ERROR_PROB_SYM_                             (ERROR_PROB_BASE + 42) */
    65 #define ERROR_PROB_SYM_IMPORTS_NOTFOUND             (ERROR_PROB_BASE + 43)
    66 #define ERROR_PROB_SYMDB_KRNL_NOT_FOUND             (ERROR_PROB_BASE + 44)
     56#define ERROR_PROB_SYM_VERIFY_IOCTL                 (ERROR_PROB_BASE + 36)
     57#define ERROR_PROB_SYM_D32_FIRST                    (ERROR_PROB_BASE + 37)
     58#define ERROR_PROB_SYM_V_GETOS2KRNL                 (ERROR_PROB_SYM_D32_FIRST + ERROR_D32_GETOS2KRNL_FAILED     - ERROR_D32_FIRST)
     59#define ERROR_PROB_SYM_V_NO_SWAPMTE                 (ERROR_PROB_SYM_D32_FIRST + ERROR_D32_NO_SWAPMTE            - ERROR_D32_FIRST)
     60#define ERROR_PROB_SYM_V_OBJECTS                    (ERROR_PROB_SYM_D32_FIRST + ERROR_D32_TOO_MANY_OBJECTS      - ERROR_D32_FIRST)
     61#define ERROR_PROB_SYM_V_OBJECT_TABLE               (ERROR_PROB_SYM_D32_FIRST + ERROR_D32_NO_OBJECT_TABLE       - ERROR_D32_FIRST)
     62#define ERROR_PROB_SYM_V_BUILD_INFO                 (ERROR_PROB_SYM_D32_FIRST + ERROR_D32_BUILD_INFO_NOT_FOUND  - ERROR_D32_FIRST)
     63#define ERROR_PROB_SYM_V_INVALID_BUILD              (ERROR_PROB_SYM_D32_FIRST + ERROR_D32_INVALID_BUILD         - ERROR_D32_FIRST)
     64#define ERROR_PROB_SYM_V_VERIFY                     (ERROR_PROB_SYM_D32_FIRST + ERROR_D32_VERIFY_FAILED         - ERROR_D32_FIRST)
     65#define ERROR_PROB_SYM_V_IPE                        (ERROR_PROB_SYM_D32_FIRST + ERROR_D32_IPE                   - ERROR_D32_FIRST)
     66#define ERROR_PROB_SYM_V_HEAPINIT                   (ERROR_PROB_SYM_D32_FIRST + ERROR_D32_HEAPINIT_FAILED       - ERROR_D32_FIRST)
     67#define ERROR_PROB_SYM_V_PROC_NOT_FND               (ERROR_PROB_SYM_D32_FIRST + ERROR_D32_PROC_NOT_FOUND        - ERROR_D32_FIRST)
     68#define ERROR_PROB_SYM_V_OBJ_OR_ADDR                (ERROR_PROB_SYM_D32_FIRST + ERROR_D32_INVALID_OBJ_OR_ADDR   - ERROR_D32_FIRST)
     69#define ERROR_PROB_SYM_V_ADDRESS                    (ERROR_PROB_SYM_D32_FIRST + ERROR_D32_INVALID_ADDRESS       - ERROR_D32_FIRST)
     70#define ERROR_PROB_SYM_V_PROLOG                     (ERROR_PROB_SYM_D32_FIRST + ERROR_D32_TOO_INVALID_PROLOG    - ERROR_D32_FIRST)
     71#define ERROR_PROB_SYM_V_NOT_IMPL                   (ERROR_PROB_SYM_D32_FIRST + ERROR_D32_NOT_IMPLEMENTED       - ERROR_D32_FIRST)
     72#define ERROR_PROB_SYM_V_D32_LDR_INIT               (ERROR_PROB_SYM_D32_FIRST + ERROR_D32_LDR_INIT_FAILED       - ERROR_D32_FIRST)
     73#define ERROR_PROB_SYM_D32_LAST                     ERROR_PROB_SYM_V_D32_LDR_INIT
     74/* - reserved for future errors - */
     75#define ERROR_PROB_SYM_IMPORTS_NOTFOUND             (ERROR_PROB_BASE + 100)
     76#define ERROR_PROB_SYMDB_KRNL_NOT_FOUND             (ERROR_PROB_BASE + 101)
    6777
    6878
    6979
    7080/*
    71  * D32init Errors
     81 * GetKernelInfo32 Errors
    7282 */
    73 #define ERROR_D32_GETOS2KRNL_FAILED                 0x01
    74 #define ERROR_D32_NO_SWAPMTE                        0x02
    75 #define ERROR_D32_TOO_MANY_OBJECTS                  0x03
    76 #define ERROR_D32_NO_OBJECT_TABLE                   0x04
    77 #define ERROR_D32_BUILD_INFO_NOT_FOUND              0x05
    78 #define ERROR_D32_INVALID_BUILD                     0x06
     83#define ERROR_D32_FIRST                              0x0001
     84#define ERROR_D32_LAST                               ERROR_D32_NOT_IMPLEMENTED
     85#define ERROR_D32_GETOS2KRNL_FAILED                 (0x0000 + ERROR_D32_FIRST)
     86#define ERROR_D32_NO_SWAPMTE                        (0x0001 + ERROR_D32_FIRST)
     87#define ERROR_D32_TOO_MANY_OBJECTS                  (0x0002 + ERROR_D32_FIRST)
     88#define ERROR_D32_NO_OBJECT_TABLE                   (0x0003 + ERROR_D32_FIRST)
     89#define ERROR_D32_BUILD_INFO_NOT_FOUND              (0x0004 + ERROR_D32_FIRST)
     90#define ERROR_D32_INVALID_BUILD                     (0x0005 + ERROR_D32_FIRST)
    7991
    80 #define ERROR_D32_VERIFYIMPORTTAB_FIRST             0x10
    81 #define ERROR_D32_PROC_NOT_FOUND                    (ERROR_D32_VERIFYIMPORTTAB_FIRST + 0)
    82 #define ERROR_D32_INVALID_OBJ_OR_ADDR               (ERROR_D32_VERIFYIMPORTTAB_FIRST + 1)
    83 #define ERROR_D32_INVALID_ADDRESS                   (ERROR_D32_VERIFYIMPORTTAB_FIRST + 2)
    84 #define ERROR_D32_TOO_INVALID_PROLOG                (ERROR_D32_VERIFYIMPORTTAB_FIRST + 3)
    85 #define ERROR_D32_NOT_IMPLEMENTED                   (ERROR_D32_VERIFYIMPORTTAB_FIRST + 4)
    86 #define ERROR_D32_VERIFYIMPORTTAB_LAST              0x1F
     92/*
     93 * R0Init32 Errors
     94 */
     95#define ERROR_D32_VERIFY_FAILED                     (0x0006 + ERROR_D32_FIRST)
     96#define ERROR_D32_IPE                               (0x0007 + ERROR_D32_FIRST)
     97#define ERROR_D32_HEAPINIT_FAILED                   (0x0008 + ERROR_D32_FIRST)
     98#define ERROR_D32_LDR_INIT_FAILED                   (0x0009 + ERROR_D32_FIRST)
    8799
    88 #define ERROR_D32_VERIFY_FAILED                     0x20
     100/*
     101 * VerifyImportTab32 errors.
     102 */
     103#define ERROR_D32_PROC_NOT_FOUND                    (0x000a + ERROR_D32_FIRST)
     104#define ERROR_D32_INVALID_OBJ_OR_ADDR               (0x000b + ERROR_D32_FIRST)
     105#define ERROR_D32_INVALID_ADDRESS                   (0x000c + ERROR_D32_FIRST)
     106#define ERROR_D32_TOO_INVALID_PROLOG                (0x000d + ERROR_D32_FIRST)
     107#define ERROR_D32_NOT_IMPLEMENTED                   (0x000e + ERROR_D32_FIRST)
     108
     109/*
     110 * Procedure shift and mask.
     111 * Used to get or set the procedure number of an error code.
     112 */
     113#define ERROR_D32_ERROR_MASK                        0xff00
     114#define ERROR_D32_PROC_MASK                         0x7f00
     115#define ERROR_D32_PROC_FLAG                         0x8000
     116#define ERROR_D32_PROC_SHIFT                        0x8
    89117
    90118
  • trunk/src/win32k/include/probkrnl.h

    r4164 r4185  
    1 /* $Id: probkrnl.h,v 1.14 2000-09-02 21:08:04 bird Exp $
     1/* $Id: probkrnl.h,v 1.15 2000-09-04 16:40:50 bird Exp $
    22 *
    33 * Include file for ProbKrnl.
     
    9898*******************************************************************************/
    9999extern IMPORTKRNLSYM DATA16_GLOBAL  aImportTab[NBR_OF_KRNLIMPORTS]; /* Defined in ProbKrnl.c */
    100 extern char          DATA16_GLOBAL  szUsrSym[50];                   /* Defined in ProbKrnl.c */
     100extern char          DATA16_GLOBAL  szSymbolFile[60];               /* Defined in ProbKrnl.c */
    101101extern KRNLDBENTRY   DATA16_INIT    aKrnlSymDB[];                   /* Defined in symdb.c (for 16-bit usage) */
    102102
    103103#if defined(__IBMC__) || defined(__IBMCPP__)
    104     #pragma map( aImportTab , "_aImportTab" )
    105     #pragma map( szUsrSym   , "_szUsrSym"   )
    106     #pragma map( aKrnlSymDB , "_aKrnlSymDB" )
     104    #pragma map( aImportTab , "_aImportTab"  )
     105    #pragma map( szSymbolFile,"_szSymbolFile")
     106    #pragma map( aKrnlSymDB , "_aKrnlSymDB"  )
    107107#endif
    108108
     109/*
     110 * 16-bit init time functions.
     111 */
    109112#if defined(INCL_16) && defined(MAX_DISKDD_CMD) /* 16-bit only */
    110113int ProbeKernel(PRPINITIN pReqPack);
    111 
    112 #if 0 /*ndef CODE16_INIT*/
    113 #pragma alloc_text(CODE16_INIT, ProbeKernel)
     114const char *    GetErrorMsg(short sErr);
    114115#endif
    115116
    116117#endif
    117118
    118 #endif
    119 
Note: See TracChangeset for help on using the changeset viewer.