Changeset 4162 for branches/GRACE/src
- Timestamp:
- Sep 2, 2000, 10:49:29 PM (25 years ago)
- Location:
- branches/GRACE/src/win32k
- Files:
-
- 28 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/GRACE/src/win32k/Makefile
r4143 r4162 1 1 ################################################################################ 2 # $Id: Makefile,v 1.43.4.1 1 2000-09-01 15:40:15 bird Exp $2 # $Id: Makefile,v 1.43.4.12 2000-09-02 20:49:05 bird Exp $ 3 3 # 4 4 # Win32k makefile. … … 48 48 49 49 CFLAGS = -q -Ge -Gs- -Gr+ -Rn -Ss+ -Mp -Wall+ppt-ppc-inl-cnv-gnr-vft-gen-uni-ext- 50 CFLAGS16 = -c -W3 -Asfw /NTCODE16 /NDDATA16 -G2s -Zp -Zl -nologo -Fo$@ -Fa50 CFLAGS16 = -c -W3 -Asfw /NTCODE16 /NDDATA16 -G2s -Zp -Zl -nologo 51 51 CPPFLAGS = -q -Ge -Gs- -Gr+ -Rn -Ss+ -Mp -Gx -Wall+ppt-ppc-inl-cnv-gnr-vft- 52 52 ASFLAGS = -Sv:ALP -Mb -Li 53 LFLAGS = /nologo /MAP /NOI /NOE /NOD /A:16 53 LFLAGS = /nologo /MAP /NOI /NOE /NOD /A:16 /PACKCODE /PACKDATA 54 54 CDEFINESB = -DWIN32K -DRING0 -D__WIN32OS2__ -D__WINE__ 55 55 CDEFINESB16 = -DRING0 56 56 ASDEFINES = -D:WIN32K 57 58 !if "$(CCENV)" == "VAC36" 59 VACLIB = $(VACPATH)\lib\cpprni36.lib 60 !else 61 VACLIB = $(VACPATH)\lib\cppon30.lib 62 !endif 57 63 58 64 … … 64 70 CFLAGS16 = $(CFLAGS16) -Ogeitln -Gs 65 71 CPPFLAGS = $(CPPFLAGS) -G5 -O+ 66 LFLAGS = $(LFLAGS) /EXEPACK:2 /NODEBUG /PACKC /PACKD72 LFLAGS = $(LFLAGS) /EXEPACK:2 /NODEBUG 67 73 CDEFINES = $(CDEFINESB) -DRELEASE 68 74 CDEFINES16 = $(CDEFINESB16) -DRELEASE … … 83 89 84 90 !ifdef NODEBUGINFO 85 LFLAGS = $(LFLAGS) /NODEB /EXEPACK:2 /PACKD /PACKC91 LFLAGS = $(LFLAGS) /NODEB /EXEPACK:2 86 92 CFLAGS16 = $(CFLAGS16) -Owis 87 93 CFLAGS = $(CFLAGS) -O+ -Os- -Oi- … … 105 111 -I$(PDWIN32_INCLUDE)\win 106 112 107 CINCLUDES16= -I$(WIN32KINCLUDE) \ 108 -I. \ 109 -I$(DDKPATH)\h \ 110 -I$(MSCPATH)\include \ 111 -I$(PDWIN32_INCLUDE) 113 CINCLUDES16= -I$(WIN32KINCLUDE) -I. -I$(DDKPATH)\h -I$(MSCPATH)\include -I$(PDWIN32_INCLUDE) 112 114 113 115 … … 121 123 .SUFFIXES: .obj .cpp .c .asm 122 124 123 {dev16}.c{$(WIN32KOBJ)}.obj:124 @$(ECHO) compiling 16bit: $<125 @$(CC16) $(CFLAGS16) $(CDEFINES16) -Fa$(WIN32KLIST)\$(*B).s -Fo$@ $(CINCLUDES16) $<126 125 {dev16}.c.obj: 127 @$(ECHO) compiling 16bit: $< 128 @$(CC16) $(CFLAGS16) $(CDEFINES16) -Fa$(WIN32KLIST)\$(*B).s -Fo$(WIN32KOBJ)\$(@F) $(CINCLUDES16) $< 129 130 {dev16}.c{$(WIN32KOBJ)}.obj_tst: 131 @$(ECHO) compiling 16bit: $< 132 @$(CC16) $(CFLAGS16) $(CDEFINES16_TST) -Fa$(WIN32KLIST)\$(*B).s -Fo$@ $(CINCLUDES16) $< 133 @$(CP) $@ $@.obj 126 @$(ECHO) compiling 16bit: $< ($@) 127 $(CC16) -c $(CFLAGS16) $(CDEFINES16) $(CINCLUDES16) -Fo$(WIN32KOBJ)\$(*B).obj -Fa$(WIN32KLIST)\$(*B).s $< 128 129 {dev16}.c.obj_init: 130 @$(ECHO) compiling 16bit: $< ($@) 131 $(CC16) -c $(CFLAGS16) $(CDEFINES16) $(CINCLUDES16) /NTCODE16_INIT /NDDATA16_INIT -Fo$(WIN32KOBJ)\$(*B).obj_init -Fa$(WIN32KLIST)\$(*B).s $< 132 $(CP) $@ $@.obj 133 134 134 {dev16}.c.obj_tst: 135 135 @$(ECHO) compiling 16bit: $< 136 @$(CC16) $(CFLAGS16) $(CDEFINES16_TST) -Fa$(WIN32KLIST)\$(*B).s -Fo$(WIN32KOBJ)\$(@F) $(CINCLUDES16) $< 137 @$(CP) $@ $@.obj 136 $(CC16) -c $(CFLAGS16) $(CDEFINES16_TST) $(CINCLUDES16) -Fa$(WIN32KLIST)\$(*B).s -Fo$(WIN32KOBJ)\$(@B).obj_tst $< 137 $(CP) $@ $@.obj 138 {dev16}.c.obj_tst_init: 139 @$(ECHO) compiling 16bit: $< 140 $(CC16) -c $(CFLAGS16) $(CDEFINES16_TST) $(CINCLUDES16) /NDDATA16_INIT /NTCODE16_INIT -Fa$(WIN32KLIST)\$(*B).s -Fo$(WIN32KOBJ)\$(@B).obj_tst_init $< 141 $(CP) $@ $@.obj 138 142 139 143 … … 304 308 all: pe2lx.exe 305 309 !else 306 all: $(WIN32KBIN)\$(NAME).sys pe2lx.exe 310 all: $(WIN32KBIN)\$(NAME).sys pe2lx.exe kRx.exe lib Win32kCC.exe 307 311 !endif 308 312 … … 344 348 $(WIN32KOBJ)\k32AllocMemEx.obj \ 345 349 $(WIN32KOBJ)\k32QueryOTEs.obj \ 346 $(WIN32KOBJ)\mytkExecPgm.obj\ 347 $(WIN32KOBJ)\mytkStartProcess.obj 348 349 350 OBJSINIT =\ 351 $(WIN32KOBJ)\d16init.obj \ 350 $(WIN32KOBJ)\k32QueryOptionsStatus.obj \ 351 $(WIN32KOBJ)\k32SetOptions.obj \ 352 $(WIN32KOBJ)\mytkExecPgm.obj \ 353 $(WIN32KOBJ)\mytkStartProcess.obj \ 354 $(WIN32KOBJ)\vprntf16.obj \ 352 355 $(WIN32KOBJ)\d32init.obj \ 353 $(WIN32KOBJ)\ProbKrnl.obj \354 356 $(WIN32KOBJ)\SymDB.obj \ 355 $(WIN32KOBJ)\vprntf16.obj 357 $(WIN32KOBJ)\d16init.obj_init \ 358 $(WIN32KOBJ)\ProbKrnl.obj_init 359 360 LASTOBJ =\ 361 $(WIN32KOBJ)\devlast.obj 356 362 357 363 LIBS =\ 358 !if "$(CCENV)" == "VAC36" 359 $(VACPATH)\lib\cpprni36.lib \ 360 !else 361 $(VACPATH)\lib\cppon30.lib \ 362 !endif 364 $(VACLIB) \ 363 365 $(DDKPATH)\lib\os2386.lib \ 364 $(WIN32KOBJ)\devhelp.lib 365 366 LIBSINIT =\ 366 $(WIN32KOBJ)\devhelp.lib \ 367 367 $(WIN32KOBJ)\clib.lib 368 368 … … 410 410 $(WIN32KOBJ)\k32AllocMemEx.obj \ 411 411 $(WIN32KOBJ)\k32QueryOTEs.obj \ 412 $(WIN32KOBJ)\ mytkExecPgm.obj\413 $(WIN32KOBJ)\ mytkStartProcess.obj414 415 TSTOBJSINIT =\416 $(WIN32KOBJ)\ d16init.obj_tst \412 $(WIN32KOBJ)\k32QueryOptionsStatus.obj \ 413 $(WIN32KOBJ)\k32SetOptions.obj \ 414 $(WIN32KOBJ)\mytkExecPgm.obj \ 415 $(WIN32KOBJ)\mytkStartProcess.obj \ 416 $(WIN32KOBJ)\vprntf16.obj_tst \ 417 417 $(WIN32KOBJ)\d32init.obj_tst \ 418 $(WIN32KOBJ)\ProbKrnl.obj_tst \419 418 $(WIN32KOBJ)\SymDB.obj \ 420 $(WIN32KOBJ)\vprntf16.obj_tst 419 $(WIN32KOBJ)\d16init.obj_tst_init \ 420 $(WIN32KOBJ)\ProbKrnl.obj_tst_init 421 422 TSTLASTOBJ = $(LASTOBJ) 421 423 422 424 TSTLIBS = $(LIBS) 423 425 424 TSTLIBSINIT = $(LIBSINIT)425 426 426 427 … … 473 474 ################################################################################ 474 475 $(NAME).sys: $(WIN32KBIN)\$(NAME).sys 475 $(WIN32KBIN)\$(NAME).sys: $(OBJS) $(LIBS) $(NAME).def \ 476 $(WIN32KOBJ)\last.lib \ 477 $(WIN32KOBJ)\init.lib \ 478 $(LIBSINIT) \ 479 makefile 476 $(WIN32KBIN)\$(NAME).sys: $(OBJS) $(LIBS) $(NAME).def $(LASTOBJ) $(LIBSINIT) makefile 480 477 -@$(ECHO) linking: $@ 481 $(LD) $(LFLAGS) @<<478 -4 $(LD) $(LFLAGS) @<<$(WIN32KOBJ)\$(@B).lnk 482 479 /OUT:$@ 483 480 /MAP:$(WIN32KBIN)\$(@B).map … … 487 484 $(LIBS: =^ 488 485 ) 489 $(WIN32KOBJ)\last.lib 490 $(WIN32KOBJ)\init.lib 491 $(LIBSINIT) 486 $(LASTOBJ) 492 487 $(NAME).def 493 << 488 <<KEEP 494 489 cd $(WIN32KBIN) 495 490 @mapsym $(*B).map > nul … … 506 501 $(CP) $(WIN32KBIN)\$@ $@ 507 502 508 $(WIN32KBIN)\$(NAME)tst.exe: \ 509 $(NAME)tst.def \ 510 $(TSTOBJS) \ 511 $(TSTLIBS) \ 512 $(WIN32KOBJ)\last.lib \ 513 $(WIN32KOBJ)\tstinit.lib \ 514 $(TSTLIBSINIT) \ 515 makefile 503 $(WIN32KBIN)\$(NAME)tst.exe: $(NAME)tst.def $(TSTOBJS) $(TSTLIBS) $(LASTOBJS) makefile 516 504 -@$(ECHO) linking: $@ 517 $(LD) $(LFLAGS) /DEBUG @<< 505 -4 $(LD) $(LFLAGS) @<<$(WIN32KOBJ)\$(@B).lnk 506 /DEBUG 518 507 /OUT:$@ 519 508 /MAP:$(WIN32KBIN)\$(@B).map … … 523 512 $(TSTLIBS: =^ 524 513 ) 525 $(WIN32KOBJ)\last.lib 526 $(WIN32KOBJ)\tstinit.lib 527 $(TSTLIBSINIT) 514 $(LASTOBJ) 528 515 $(NAME)tst.def 529 << 516 <<KEEP 517 530 518 531 519 ################################################################################ … … 546 534 547 535 ################################################################################ 536 # Win32k Control Center Rule. 537 ################################################################################ 538 Win32kCC.exe: 539 cd utils 540 $(MAKE_CMD) 541 cd .. 542 543 ################################################################################ 544 # kRx.EXE - Pure Rexx interpreter 545 ################################################################################ 546 kRx.exe: 547 cd rexx 548 $(MAKE_CMD) 549 cd .. 550 551 ################################################################################ 548 552 # Libraries - segments are renamed for the 16-bit libraries. 549 553 ################################################################################ 550 DHLPOBJS = +dhcall5b.obj +dhcal11a.obj +dhcal11g.obj +dhret.obj 554 DHLPOBJS = +$(WIN32KOBJ)\dhcall5b.obj +$(WIN32KOBJ)\dhcal11a.obj \ 555 +$(WIN32KOBJ)\dhcal11g.obj +$(WIN32KOBJ)\dhret.obj 551 556 552 557 $(WIN32KOBJ)\devhelp.lib: $(DDKPATH)\lib\dhcalls.lib $(WIN32KBIN)\libconv.exe $(DHLPOBJS:+=) … … 569 574 570 575 571 CLIBOBJS = +inp.obj +outp.obj +anfalmul.obj +anfaldiv.obj +anfalrem.obj +anfauldi.obj \ 572 +anuldiv.obj +fmemcpy.obj +anulrem.obj +anlmul.obj +__AHINCR.obj 576 CLIBOBJS = +$(WIN32KOBJ)\inp.obj +$(WIN32KOBJ)\outp.obj \ 577 +$(WIN32KOBJ)\anfalmul.obj +$(WIN32KOBJ)\anfaldiv.obj \ 578 +$(WIN32KOBJ)\anfalrem.obj +$(WIN32KOBJ)\anfauldi.obj \ 579 +$(WIN32KOBJ)\anuldiv.obj +$(WIN32KOBJ)\fmemcpy.obj \ 580 +$(WIN32KOBJ)\anulrem.obj +$(WIN32KOBJ)\anlmul.obj \ 581 +$(WIN32KOBJ)\__AHINCR.obj 573 582 574 583 $(WIN32KOBJ)\clib.lib: $(MSCPATH)\lib\clibcep.lib $(WIN32KBIN)\libconv.exe $(CLIBOBJS:+=) … … 588 597 589 598 $(WIN32KOBJ)\last.lib: $(WIN32KOBJ)\devlast.obj 590 -@$(RM) $@ > nul 2> nul591 $(ILIB) $@ $**;592 593 $(WIN32KOBJ)\init.lib: $(OBJSINIT)594 -@$(RM) $@ > nul 2> nul595 $(ILIB) $@ $**;596 597 $(WIN32KOBJ)\tstinit.lib: $(TSTOBJSINIT)598 599 -@$(RM) $@ > nul 2> nul 599 600 $(ILIB) $@ $**; -
branches/GRACE/src/win32k/configure.cmd
r4143 r4162 1 /* $Id: configure.cmd,v 1.10.4. 1 2000-09-01 15:40:14bird Exp $1 /* $Id: configure.cmd,v 1.10.4.2 2000-09-02 20:49:06 bird Exp $ 2 2 * 3 3 * Configuration script. … … 108 108 * Create output directories. 109 109 */ 110 'mkdir bin > nul 2> nul'111 'mkdir bin\release > nul 2> nul'112 'mkdir bin\debug > nul 2> nul'110 'mkdir Bin > nul 2> nul' 111 'mkdir Bin\Release > nul 2> nul' 112 'mkdir Bin\Debug > nul 2> nul' 113 113 114 'mkdir list > nul 2> nul'115 'mkdir list\release > nul 2> nul'116 'mkdir list\debug > nul 2> nul'114 'mkdir List > nul 2> nul' 115 'mkdir List\Release > nul 2> nul' 116 'mkdir List\Debug > nul 2> nul' 117 117 118 'mkdir object > nul 2> nul'119 'mkdir object\debug > nul 2> nul'120 'mkdir object\release > nul 2> nul'118 'mkdir Object > nul 2> nul' 119 'mkdir Object\Debug > nul 2> nul' 120 'mkdir Object\Release > nul 2> nul' 121 121 122 122 /* -
branches/GRACE/src/win32k/dev16/SymDB.c
r4117 r4162 1 /* $Id: SymDB.c,v 1.3.4. 6 2000-08-30 04:11:23bird Exp $1 /* $Id: SymDB.c,v 1.3.4.7 2000-09-02 20:49:06 bird Exp $ 2 2 * 3 3 * Autogenerated kernel symbol database. … … 12 12 #define INCL_NOBASEAPI 13 13 #include <os2.h> 14 #include "devSegDf.h" 14 15 #include "probkrnl.h" 15 16 #include "options.h" 16 17 17 KRNLDBENTRY aKrnlSymDB[] =18 KRNLDBENTRY DATA16_INIT aKrnlSymDB[] = 18 19 { 19 20 #ifdef ALLKERNELS -
branches/GRACE/src/win32k/dev16/d16init.c
r4117 r4162 1 /* $Id: d16init.c,v 1.6.4. 4 2000-08-30 04:11:26bird Exp $1 /* $Id: d16init.c,v 1.6.4.5 2000-09-02 20:49:09 bird Exp $ 2 2 * 3 3 * d16init - init routines for both drivers. … … 36 36 #include <memory.h> 37 37 38 #include "devSegDf.h" 39 #undef DATA16_INIT 40 #define DATA16_INIT 41 #undef CODE16_INIT 42 #define CODE16_INIT 38 43 #include "probkrnl.h" 39 44 #include "dev1632.h" … … 42 47 #include "log.h" 43 48 #include "options.h" 49 50 44 51 45 52 /** … … 66 73 67 74 pRpOut->BPBArray = NULL; 68 pRpOut->CodeEnd = (USHORT)&CODE16END;69 pRpOut->DataEnd = (USHORT)&DATA16END;75 pRpOut->CodeEnd = (USHORT)&CODE16_INITSTART; 76 pRpOut->DataEnd = (USHORT)&DATA16_INITSTART; 70 77 pRpOut->Unit = 0; 71 78 pRpOut->rph.Status = STATUS_DONE; … … 134 141 * Fill return data. 135 142 */ 136 pRpOut->CodeEnd = (USHORT)&CODE16 END;137 pRpOut->DataEnd = (USHORT)&DATA16 END;143 pRpOut->CodeEnd = (USHORT)&CODE16_INITSTART; 144 pRpOut->DataEnd = (USHORT)&DATA16_INITSTART; 138 145 pRpOut->BPBArray= NULL; 139 146 pRpOut->Unit = 0; … … 163 170 * @param pRp Generic IO Control request packet. 164 171 */ 165 USHORT NEAR R0Init16(PRP_GENIOCTL pRp)172 USHORT NEAR R0Init16(PRP_GENIOCTL pRp) 166 173 { 167 174 USHORT usRc = STATUS_DONE; … … 244 251 * (Since this is init code not present after init...) 245 252 */ 246 USHORT NEAR initGetDosTableData(void)253 USHORT NEAR initGetDosTableData(void) 247 254 { 248 255 APIRET rc; -
branches/GRACE/src/win32k/dev16/probkrnl.c
r4120 r4162 1 /* $Id: probkrnl.c,v 1.20.4.1 4 2000-08-30 04:45:58bird Exp $1 /* $Id: probkrnl.c,v 1.20.4.15 2000-09-02 20:49:10 bird Exp $ 2 2 * 3 3 * Description: Autoprobes the os2krnl file and os2krnl[*].sym files. … … 61 61 #include <reqpkt.h> 62 62 63 #include "devSegDf.h" 64 #undef DATA16_INIT 65 #define DATA16_INIT 66 #undef CODE16_INIT 67 #define CODE16_INIT 63 68 #include "os2krnl.h" /* must be included before dev1632.h! */ 64 69 #include "sym.h" … … 75 80 * Note: must be inited or else we'll get BSS segment * 76 81 *******************************************************************************/ 77 /* 78 * kernel data - !only valid during init! 79 */ 82 80 83 81 84 /* … … 86 89 * calltab.asm has to be updated immediately! 87 90 */ 88 IMPORTKRNLSYM aImportTab[NBR_OF_KRNLIMPORTS] =91 IMPORTKRNLSYM DATA16_GLOBAL aImportTab[NBR_OF_KRNLIMPORTS] = 89 92 {/* iFound cchName offObject usSel fType */ 90 93 /* iObject achName ulAddress cProlog */ … … 134 137 }; 135 138 139 char DATA16_GLOBAL szUsrSym[50] = {0}; 140 141 136 142 137 143 /* … … 139 145 */ 140 146 #if defined(DEBUGR3) 141 static char 142 static char 147 static char DATA16_INIT szUsrOS2Krnl[50] = {0}; 148 static char DATA16_INIT szOS2Krnl[] = {"c:\\os2krnl"}; 143 149 #endif 144 static char szUsrSym[50] = {0}; 145 static char * apszSym[] = 150 static char * DATA16_INIT apszSym[] = 146 151 { 147 152 {"c:\\os2krnl.sym"}, /* usual for debugkernel */ … … 164 169 165 170 /* Result from GetKernelInfo/ReadOS2Krnl. */ 166 static unsigned char cObjects = 0;167 static POTE paKrnlOTEs = NULL;171 static unsigned char DATA16_INIT cObjects = 0; 172 static POTE DATA16_INIT paKrnlOTEs = NULL; 168 173 169 174 … … 175 180 short sErr; 176 181 const char *pszMsg; 177 } aErrorMsgs[] =182 } DATA16_INIT aErrorMsgs[] = 178 183 { 179 184 {ERROR_PROB_KRNL_OPEN_FAILED, "Krnl: Failed to open kernel file."}, … … 221 226 */ 222 227 #ifdef R3TST 223 USHORT 224 USHORT 228 USHORT DATA16_INIT usFakeVerMajor = 0; 229 USHORT DATA16_INIT usFakeVerMinor = 0; 225 230 #ifdef R3TST 226 static ach[11] = {0}; /* works around compiler/linker bug */231 static DATA16_INIT ach[11] = {0}; /* works around compiler/linker bug */ 227 232 #endif 228 233 #endif … … 265 270 static int processFile(const char *pszFilename); 266 271 272 #if 0 /*ndef CODE16_INIT*/ 273 #pragma alloc_text(CODE16_INIT, fopen, fread, fseek, fsize) 274 #pragma alloc_text(CODE16_INIT, kmemcpy, kstrstr, kstrcmp, kstrncmp, kstrnicmp, kstrlen, kstrcpy, kargncpy) 275 #pragma alloc_text(CODE16_INIT, GetErrorMsg) 276 #pragma alloc_text(CODE16_INIT, LookupKrnlEntry, VerifyPrologs, ProbeSymFile, GetKernelInfo) 277 #pragma alloc_text(CODE16_INIT, ShowResult) 278 #pragma alloc_text(CODE16_INIT, VerifyKernelVer, ReadOS2Krnl, ReadOS2Krnl2, processFile) 279 #endif 267 280 268 281 … … 490 503 while (*pszSource != '\0') 491 504 *psz++ = *pszSource++; 492 505 *psz = '\0'; 493 506 return pszTarget; 494 507 } … … 949 962 { 950 963 #if !defined(DEBUGR3) && !defined(EXTRACT) /* This IOCtl is not available after inittime! */ 951 static KRNLINFO KrnlInfo = {0};964 static KRNLINFO DATA16_INIT KrnlInfo = {0}; 952 965 APIRET rc; 953 966 HFILE hDev0 = 0; … … 1233 1246 ) 1234 1247 { 1235 #if ndef R3TST1248 #if 1 /* ndef R3TST */ 1236 1249 APIRET rc2; 1237 1250 /* search on disk */ … … 1245 1258 rc = rc2; 1246 1259 } 1260 if (rc == 1 || rc2 == NO_ERROR) 1261 rc = rc2; 1247 1262 #endif 1248 1263 } … … 1253 1268 dprintf(("rc=%d; i=%d\n", rc, i)); 1254 1269 ShowResult(rc, i); 1270 1271 /* Copy the symbol file name to szUsrSym. */ 1272 if (szUsrSym[0] == '\0' && apszSym[i] != NULL) 1273 kstrcpy(szUsrSym, apszSym[i]); 1255 1274 1256 1275 return rc; … … 1331 1350 { 1332 1351 #if defined(DEBUGR3) || !defined(EXTRACT) 1333 static KRNLINFO KrnlInfo = {0};1352 static KRNLINFO DATA16_INIT KrnlInfo = {0}; 1334 1353 #endif 1335 1354 int i, j; … … 1660 1679 * Set paKrnlOTEs to point to an zeroed array of OTEs. 1661 1680 */ 1662 static KRNLINFO KrnlInfo = {0};1681 static KRNLINFO DATA16_INIT KrnlInfo = {0}; 1663 1682 paKrnlOTEs = &KrnlInfo.aObjects[0]; 1664 1683 … … 1695 1714 int i; 1696 1715 1697 printf16("/* $Id: probkrnl.c,v 1.20.4.1 4 2000-08-30 04:45:58bird Exp $\n"1716 printf16("/* $Id: probkrnl.c,v 1.20.4.15 2000-09-02 20:49:10 bird Exp $\n" 1698 1717 "*\n" 1699 1718 "* Autogenerated kernel symbol database.\n" … … 1709 1728 "#define INCL_NOBASEAPI\n" 1710 1729 "#include <os2.h>\n" 1730 "#include \"DevSegDf.h\"\n" 1711 1731 "#include \"probkrnl.h\"\n" 1712 1732 "#include \"options.h\"\n" 1713 1733 "\n"); 1714 1734 1715 printf16("KRNLDBENTRY aKrnlSymDB[] = \n"1735 printf16("KRNLDBENTRY DATA16_INIT aKrnlSymDB[] = \n" 1716 1736 "{\n"); 1717 1737 -
branches/GRACE/src/win32k/dev16/vprntf16.c
r4017 r4162 1 /* $Id: vprntf16.c,v 1.2.4. 2 2000-08-15 06:16:00 bird Exp $1 /* $Id: vprntf16.c,v 1.2.4.3 2000-09-02 20:49:10 bird Exp $ 2 2 * 3 3 * vprintf and printf - 16-bit. … … 36 36 #include <os2.h> 37 37 38 #include "devSegDf.h" /* Win32k segment definitions. */ 39 #include "dev16.h" 38 40 #include "vprntf16.h" 39 41 #ifdef RING0 … … 41 43 #include "conio.h" 42 44 #endif 43 #include "dev16.h"44 45 45 46 /******************************************************************************* … … 218 219 * @param args Argument list. 219 220 */ 220 int vprintf16(const char *pszFormat, va_list args)221 int FAR vprintf16(const char *pszFormat, va_list args) 221 222 { 222 223 int cch = 0; … … 392 393 * @param ... Optional parameters. 393 394 */ 394 int printf16(const char *pszFormat, ...)395 int FAR printf16(const char *pszFormat, ...) 395 396 { 396 397 int cch; -
branches/GRACE/src/win32k/dev32/d32ElfIOCtl.c
r2799 r4162 1 /* $Id: d32ElfIOCtl.c,v 1.1 2000-02-15 23:39:18bird Exp $1 /* $Id: d32ElfIOCtl.c,v 1.1.4.1 2000-09-02 20:49:11 bird Exp $ 2 2 * 3 3 * Elf driver IOCtl handler function. … … 20 20 #include <os2.h> 21 21 22 #include "devSegDf.h" 22 23 #include "dev1632.h" 23 24 #include "dev32.h" -
branches/GRACE/src/win32k/dev32/d32Win32kIOCtl.c
r4112 r4162 1 /* $Id: d32Win32kIOCtl.c,v 1.1.4. 1 2000-08-29 19:47:01 bird Exp $1 /* $Id: d32Win32kIOCtl.c,v 1.1.4.2 2000-09-02 20:49:11 bird Exp $ 2 2 * 3 3 * Win32k driver IOCtl handler function. … … 22 22 #include <os2.h> 23 23 24 #include "devSegDf.h" 24 25 #include "dev1632.h" 25 26 #include "dev32.h" … … 61 62 return STATUS_DONE; 62 63 } 64 65 case K32_QUERYOPTIONSSTATUS: 66 { 67 PK32QUERYOPTIONSSTATUS pParm = (PK32QUERYOPTIONSSTATUS)pRpIOCtl->ParmPacket; 68 if (pParm == NULL) 69 return STATUS_DONE | STERR | ERROR_I24_INVALID_PARAMETER; 70 pParm->rc = k32QueryOptionsStatus(pParm->pOptions, pParm->pStatus); 71 return STATUS_DONE; 72 } 73 74 case K32_SETOPTIONS: 75 { 76 PK32SETOPTIONS pParm = (PK32SETOPTIONS)pRpIOCtl->ParmPacket; 77 if (pParm == NULL) 78 return STATUS_DONE | STERR | ERROR_I24_INVALID_PARAMETER; 79 pParm->rc = k32SetOptions(pParm->pOptions); 80 return STATUS_DONE; 81 } 82 63 83 } 64 84 break; -
branches/GRACE/src/win32k/dev32/d32init.c
r4117 r4162 1 /* $Id: d32init.c,v 1.19.4.1 2 2000-08-30 04:11:28bird Exp $1 /* $Id: d32init.c,v 1.19.4.13 2000-09-02 20:49:11 bird Exp $ 2 2 * 3 3 * d32init.c - 32-bits init routines. … … 32 32 #include <string.h> 33 33 34 #include "devSegDf.h" 34 35 #include "OS2Krnl.h" 35 36 #include "options.h" … … 166 167 break; 167 168 169 case 'j': 170 case 'J': /* -Java:<Yes|No> */ 171 pszTmp2 = strpbrk(pszTmp, ":=/- "); 172 options.fJava = 173 pszTmp2 != NULL 174 && (int)(pszTmp2-pszTmp) < cch-1 175 && (*pszTmp2 == ':' || *pszTmp2 == '=') 176 && (pszTmp2[1] == 'Y' || pszTmp2[1] == 'y'); 177 break; 178 168 179 case 'l': 169 180 case 'L': /* -L[..]<:|=| >[<Y..|E..| > | <N..|D..>] */ … … 209 220 210 221 case 'r': 211 case 'R': /* ResHeap options */222 case 'R': /* ResHeap options or REXX option */ 212 223 pszTmp2 = strpbrk(pszTmp, ":=/- "); 213 if (pszTmp2 != NULL && (*pszTmp2 == ':' || *pszTmp2 == '=')) 214 { 215 ul = readnum(pszTmp2 + 1); 216 if (ul > 0x1000UL && ul < 0x700000UL) /* 4KB < ul < 7MB */ 224 if ( (pszTmp[1] == 'E' || pszTmp[1] == 'e') 225 && (pszTmp[2] == 'X' || pszTmp[2] == 'x')) 226 { /* REXX */ 227 options.fREXXScript = 228 pszTmp2 != NULL 229 && (int)(pszTmp2-pszTmp) < cch-1 230 && (*pszTmp2 == ':' || *pszTmp2 == '=') 231 && (pszTmp2[1] == 'Y' || pszTmp2[1] == 'y'); 232 } 233 else 234 { /* ResHeap options */ 235 if (pszTmp2 != NULL && (*pszTmp2 == ':' || *pszTmp2 == '=')) 217 236 { 218 if (strnicmp(pszTmp, "resheapm", 8) == 0) 219 options.cbResHeapMax = ul; 220 else 221 options.cbResHeapInit = ul; 237 ul = readnum(pszTmp2 + 1); 238 if (ul > 0x1000UL && ul < 0x700000UL) /* 4KB < ul < 7MB */ 239 { 240 if (strnicmp(pszTmp, "resheapm", 8) == 0) 241 options.cbResHeapMax = ul; 242 else 243 options.cbResHeapInit = ul; 244 } 222 245 } 223 246 } … … 1049 1072 */ 1050 1073 kprintf2(("VerifyImportTab32: procedure no.%d is being checked: %s addr=0x%08x iObj=%d offObj=%d\n", 1051 i, & _aImportTab[i].achName[0], _aImportTab[i].ulAddress,1052 _aImportTab[i].iObject, _aImportTab[i].offObject));1074 i, &aImportTab[i].achName[0], aImportTab[i].ulAddress, 1075 aImportTab[i].iObject, aImportTab[i].offObject)); 1053 1076 1054 1077 /* Verify that it is found */ 1055 if (! _aImportTab[i].fFound)1056 { 1057 if ( _aImportTab[i].fType & EPT_NOT_REQ)1078 if (!aImportTab[i].fFound) 1079 { 1080 if (aImportTab[i].fType & EPT_NOT_REQ) 1058 1081 continue; 1059 1082 else … … 1065 1088 1066 1089 /* Verify read/writeable. */ 1067 if ( _aImportTab[i].iObject >= pKrnlSMTE->smte_objcnt /* object index valid? */1068 || _aImportTab[i].ulAddress < pKrnlOTE[_aImportTab[i].iObject].ote_base/* address valid? */1069 || _aImportTab[i].ulAddress + 16 > (pKrnlOTE[_aImportTab[i].iObject].ote_base +1070 pKrnlOTE[ _aImportTab[i].iObject].ote_size) /* address valid? */1071 || _aImportTab[i].ulAddress - _aImportTab[i].offObject1072 != pKrnlOTE[ _aImportTab[i].iObject].ote_base /* offObject ok? */1090 if (aImportTab[i].iObject >= pKrnlSMTE->smte_objcnt /* object index valid? */ 1091 || aImportTab[i].ulAddress < pKrnlOTE[aImportTab[i].iObject].ote_base /* address valid? */ 1092 || aImportTab[i].ulAddress + 16 > (pKrnlOTE[aImportTab[i].iObject].ote_base + 1093 pKrnlOTE[aImportTab[i].iObject].ote_size) /* address valid? */ 1094 || aImportTab[i].ulAddress - aImportTab[i].offObject 1095 != pKrnlOTE[aImportTab[i].iObject].ote_base /* offObject ok? */ 1073 1096 ) 1074 1097 { 1075 1098 kprintf(("VerifyImportTab32: procedure no.%d has an invalid address or object number.!\n" 1076 1099 " %s addr=0x%08x iObj=%d offObj=%d\n", 1077 i, & _aImportTab[i].achName[0], _aImportTab[i].ulAddress,1078 _aImportTab[i].iObject, _aImportTab[i].offObject));1100 i, &aImportTab[i].achName[0], aImportTab[i].ulAddress, 1101 aImportTab[i].iObject, aImportTab[i].offObject)); 1079 1102 return STATUS_DONE | STERR | ERROR_D32_INVALID_OBJ_OR_ADDR; 1080 1103 } … … 1082 1105 1083 1106 #ifndef R3TST 1084 if ( _aImportTab[i].ulAddress < 0xff400000UL)1107 if (aImportTab[i].ulAddress < 0xff400000UL) 1085 1108 { 1086 1109 kprintf(("VerifyImportTab32: procedure no.%d has an invalid address, %#08x!\n", 1087 i, _aImportTab[i].ulAddress));1110 i, aImportTab[i].ulAddress)); 1088 1111 return STATUS_DONE | STERR | ERROR_D32_INVALID_ADDRESS; 1089 1112 } 1090 1113 #endif 1091 1114 1092 switch ( _aImportTab[i].fType & ~(EPT_BIT_MASK | EPT_NOT_REQ))1115 switch (aImportTab[i].fType & ~(EPT_BIT_MASK | EPT_NOT_REQ)) 1093 1116 { 1094 1117 case EPT_PROC: … … 1097 1120 * Verify known function prolog. 1098 1121 */ 1099 if (EPT32BitEntry( _aImportTab[i]))1122 if (EPT32BitEntry(aImportTab[i])) 1100 1123 { 1101 cb = interpretFunctionProlog32((char*) _aImportTab[i].ulAddress,1102 _aImportTab[i].fType == EPT_PROC32);1124 cb = interpretFunctionProlog32((char*)aImportTab[i].ulAddress, 1125 aImportTab[i].fType == EPT_PROC32); 1103 1126 cbmin = 5; /* Size of the jump instruction */ 1104 1127 } 1105 1128 else 1106 1129 { 1107 cb = interpretFunctionProlog16((char*) _aImportTab[i].ulAddress,1108 _aImportTab[i].fType == EPT_PROC16);1130 cb = interpretFunctionProlog16((char*)aImportTab[i].ulAddress, 1131 aImportTab[i].fType == EPT_PROC16); 1109 1132 cbmin = 7; /* Size of the far jump instruction */ 1110 1133 } … … 1204 1227 { 1205 1228 /* EPT_VARIMPORTs are skipped */ 1206 if (( _aImportTab[i].fType & ~EPT_BIT_MASK) == EPT_VARIMPORT)1229 if ((aImportTab[i].fType & ~EPT_BIT_MASK) == EPT_VARIMPORT) 1207 1230 continue; 1208 1231 /* EPT_NOT_REQ which is not found are set pointing to the nop function provided. */ 1209 if (! _aImportTab[i].fFound && (_aImportTab[i].fType & EPT_NOT_REQ))1210 { 1211 _aImportTab[i].ulAddress = auFuncs[i];1232 if (!aImportTab[i].fFound && (aImportTab[i].fType & EPT_NOT_REQ)) 1233 { 1234 aImportTab[i].ulAddress = auFuncs[i]; 1212 1235 continue; 1213 1236 } 1214 1237 1215 if (EPT32BitEntry( _aImportTab[i]))1216 { 1217 cb = interpretFunctionProlog32((char*) _aImportTab[i].ulAddress, _aImportTab[i].fType == EPT_PROC32);1238 if (EPT32BitEntry(aImportTab[i])) 1239 { 1240 cb = interpretFunctionProlog32((char*)aImportTab[i].ulAddress, aImportTab[i].fType == EPT_PROC32); 1218 1241 cbmin = 5; /* Size of the jump instruction */ 1219 1242 } 1220 1243 else 1221 1244 { 1222 cb = interpretFunctionProlog16((char*) _aImportTab[i].ulAddress, _aImportTab[i].fType == EPT_PROC16);1245 cb = interpretFunctionProlog16((char*)aImportTab[i].ulAddress, aImportTab[i].fType == EPT_PROC16); 1223 1246 cbmin = 7; /* Size of the far jump instruction */ 1224 1247 } … … 1235 1258 for (i = 0; i < NBR_OF_KRNLIMPORTS; i++) 1236 1259 { 1237 switch ( _aImportTab[i].fType & ~EPT_NOT_REQ)1260 switch (aImportTab[i].fType & ~EPT_NOT_REQ) 1238 1261 { 1239 1262 /* … … 1245 1268 case EPT_PROC32: 1246 1269 { 1247 cb = interpretFunctionProlog32((char*) _aImportTab[i].ulAddress, TRUE);1248 _aImportTab[i].cbProlog = (char)cb;1270 cb = interpretFunctionProlog32((char*)aImportTab[i].ulAddress, TRUE); 1271 aImportTab[i].cbProlog = (char)cb; 1249 1272 if (cb >= 5 && cb + 5 < MAXSIZE_PROLOG) /* 5(1st): size of jump instruction in the function prolog which jumps to my overloading function */ 1250 1273 { /* 5(2nd): size of jump instruction which jumps back to the original function after executing the prolog copied to the callTab entry for this function. */ … … 1252 1275 * Copy function prolog which will be overwritten by the jmp to calltabl. 1253 1276 */ 1254 memcpy(callTab[i], (void*) _aImportTab[i].ulAddress, (size_t)cb);1277 memcpy(callTab[i], (void*)aImportTab[i].ulAddress, (size_t)cb); 1255 1278 1256 1279 /* … … 1260 1283 */ 1261 1284 callTab[i][cb] = 0xE9; /* jmp */ 1262 *(unsigned long*)(void*)&callTab[i][cb+1] = _aImportTab[i].ulAddress + cb - (unsigned long)&callTab[i][cb+5];1285 *(unsigned long*)(void*)&callTab[i][cb+1] = aImportTab[i].ulAddress + cb - (unsigned long)&callTab[i][cb+5]; 1263 1286 1264 1287 /* 1265 1288 * Jump from original function to my function - an cli(?) could be needed here 1266 1289 */ 1267 *(char*) _aImportTab[i].ulAddress = 0xE9; /* jmp */1268 *(unsigned long*)( _aImportTab[i].ulAddress + 1) = auFuncs[i] - (_aImportTab[i].ulAddress + 5);1290 *(char*)aImportTab[i].ulAddress = 0xE9; /* jmp */ 1291 *(unsigned long*)(aImportTab[i].ulAddress + 1) = auFuncs[i] - (aImportTab[i].ulAddress + 5); 1269 1292 } 1270 1293 else … … 1287 1310 Int3(); 1288 1311 1289 cb = interpretFunctionProlog16((char*) _aImportTab[i].ulAddress, TRUE);1290 _aImportTab[i].cbProlog = (char)cb;1312 cb = interpretFunctionProlog16((char*)aImportTab[i].ulAddress, TRUE); 1313 aImportTab[i].cbProlog = (char)cb; 1291 1314 if (cb >= 8 && cb + 7 < MAXSIZE_PROLOG) /* 8: size of a 16:32 jump which jumps to my overloading function (prefixed with 66h in a 16-bit segment) */ 1292 1315 { /* 7: size of a 16:32 jump which is added to the call tab */ … … 1294 1317 * Copy function prolog which is to be overwritten. 1295 1318 */ 1296 memcpy(callTab[i], (void*) _aImportTab[i].ulAddress, (size_t)cb);1319 memcpy(callTab[i], (void*)aImportTab[i].ulAddress, (size_t)cb); 1297 1320 1298 1321 /* … … 1301 1324 */ 1302 1325 callTab[i][cb] = 0xEA; /* jmp far ptr */ 1303 *(unsigned long*)(void*)&callTab[i][cb+1] = _aImportTab[i].offObject;1304 *(unsigned short*)(void*)&callTab[i][cb+5] = _aImportTab[i].usSel;1326 *(unsigned long*)(void*)&callTab[i][cb+1] = aImportTab[i].offObject; 1327 *(unsigned short*)(void*)&callTab[i][cb+5] = aImportTab[i].usSel; 1305 1328 1306 1329 /* … … 1308 1331 * 0x66 0xEA <four byte target address> <two byte target selector> 1309 1332 */ 1310 *(char*)( _aImportTab[i].ulAddress ) = 0x66; /* operandsize prefix */1311 *(char*)( _aImportTab[i].ulAddress + 1) = 0xEA; /* jmp far ptr */1312 *(unsigned long*)( _aImportTab[i].ulAddress + 2) = auFuncs[i]; /* FIXME? */1313 *(unsigned short*)( _aImportTab[i].ulAddress + 6) = _R0FlatCS16; /* FIXME */1333 *(char*)(aImportTab[i].ulAddress ) = 0x66; /* operandsize prefix */ 1334 *(char*)(aImportTab[i].ulAddress + 1) = 0xEA; /* jmp far ptr */ 1335 *(unsigned long*)(aImportTab[i].ulAddress + 2) = auFuncs[i]; /* FIXME? */ 1336 *(unsigned short*)(aImportTab[i].ulAddress + 6) = _R0FlatCS16; /* FIXME */ 1314 1337 } 1315 1338 else … … 1329 1352 case EPT_PROCIMPORT32: 1330 1353 { 1331 cb = interpretFunctionProlog32((char*) _aImportTab[i].ulAddress, FALSE);1332 _aImportTab[i].cbProlog = (char)cb;1354 cb = interpretFunctionProlog32((char*)aImportTab[i].ulAddress, FALSE); 1355 aImportTab[i].cbProlog = (char)cb; 1333 1356 if (cb > 0) /* Since no prolog part is copied to the function table, it's ok as long as the prolog has been recognzied. */ 1334 1357 { … … 1339 1362 */ 1340 1363 callTab[i][0] = 0xE9; /* jmp */ 1341 *(unsigned*)(void*)&callTab[i][1] = _aImportTab[i].ulAddress - (unsigned)&callTab[i][5];1364 *(unsigned*)(void*)&callTab[i][1] = aImportTab[i].ulAddress - (unsigned)&callTab[i][5]; 1342 1365 } 1343 1366 else … … 1357 1380 case EPT_PROCIMPORT16: 1358 1381 { 1359 cb = interpretFunctionProlog16((char*) _aImportTab[i].ulAddress, FALSE);1360 _aImportTab[i].cbProlog = (char)cb;1382 cb = interpretFunctionProlog16((char*)aImportTab[i].ulAddress, FALSE); 1383 aImportTab[i].cbProlog = (char)cb; 1361 1384 if (cb > 0) /* Since no prolog part is copied to the function table, it's ok as long as the prolog has been recognzied. */ 1362 1385 { … … 1366 1389 */ 1367 1390 callTab[i][0] = 0xEA; /* jmp far ptr */ 1368 *(unsigned long*)(void*)&callTab[i][1] = _aImportTab[i].offObject;1369 *(unsigned short*)(void*)&callTab[i][5] = _aImportTab[i].usSel;1391 *(unsigned long*)(void*)&callTab[i][1] = aImportTab[i].offObject; 1392 *(unsigned short*)(void*)&callTab[i][5] = aImportTab[i].usSel; 1370 1393 } 1371 1394 else … … 1389 1412 case EPT_VARIMPORT32: 1390 1413 case EPT_VARIMPORT16: 1391 _aImportTab[i].cbProlog = (char)0;1392 *(unsigned long*)(void*)&callTab[i][0] = _aImportTab[i].ulAddress;1393 *(unsigned long*)(void*)&callTab[i][4] = _aImportTab[i].offObject;1394 *(unsigned short*)(void*)&callTab[i][8] = _aImportTab[i].usSel;1395 *(unsigned short*)(void*)&callTab[i][0xa] = (unsigned short) _aImportTab[i].offObject;1396 *(unsigned short*)(void*)&callTab[i][0xc] = _aImportTab[i].usSel;1414 aImportTab[i].cbProlog = (char)0; 1415 *(unsigned long*)(void*)&callTab[i][0] = aImportTab[i].ulAddress; 1416 *(unsigned long*)(void*)&callTab[i][4] = aImportTab[i].offObject; 1417 *(unsigned short*)(void*)&callTab[i][8] = aImportTab[i].usSel; 1418 *(unsigned short*)(void*)&callTab[i][0xa] = (unsigned short)aImportTab[i].offObject; 1419 *(unsigned short*)(void*)&callTab[i][0xc] = aImportTab[i].usSel; 1397 1420 break; 1398 1421 … … 1429 1452 /** 1430 1453 * -Ring-3 testing- 1431 * Changes the entries in _aImportTab to point to their fake equivalents.1454 * Changes the entries in aImportTab to point to their fake equivalents. 1432 1455 * @returns void 1433 1456 * @param void 1434 1457 * @status completely implemented. 1435 1458 * @author knut st. osmundsen (knut.stange.osmundsen@pmsc.no) 1436 * @remark Called before the _aImportTab array is used/verified.1459 * @remark Called before the aImportTab array is used/verified. 1437 1460 */ 1438 1461 VOID R3TstFixImportTab(VOID) … … 1492 1515 for (i = 0; i < NBR_OF_KRNLIMPORTS; i++) 1493 1516 { 1494 switch ( _aImportTab[i].fType)1517 switch (aImportTab[i].fType) 1495 1518 { 1496 1519 case EPT_PROC32: … … 1513 1536 } /* switch - type */ 1514 1537 1515 _aImportTab[i].ulAddress = aTstFakers[i].uAddress;1538 aImportTab[i].ulAddress = aTstFakers[i].uAddress; 1516 1539 switch (aTstFakers[i].fObj) 1517 1540 { 1518 1541 case 1: 1519 _aImportTab[i].usSel = GetSelectorCODE32();1520 _aImportTab[i].offObject = aTstFakers[i].uAddress - (unsigned)&CODE32START;1542 aImportTab[i].usSel = GetSelectorCODE32(); 1543 aImportTab[i].offObject = aTstFakers[i].uAddress - (unsigned)&CODE32START; 1521 1544 break; 1522 1545 case 2: 1523 _aImportTab[i].usSel = GetSelectorCODE16();1524 _aImportTab[i].offObject = aTstFakers[i].uAddress - (unsigned)&CODE16START;1546 aImportTab[i].usSel = GetSelectorCODE16(); 1547 aImportTab[i].offObject = aTstFakers[i].uAddress - (unsigned)&CODE16START; 1525 1548 break; 1526 1549 case 3: 1527 _aImportTab[i].usSel = GetSelectorDATA32();1528 _aImportTab[i].offObject = aTstFakers[i].uAddress - (unsigned)&DATA32START;1550 aImportTab[i].usSel = GetSelectorDATA32(); 1551 aImportTab[i].offObject = aTstFakers[i].uAddress - (unsigned)&DATA32START; 1529 1552 break; 1530 1553 case 4: 1531 _aImportTab[i].usSel = GetSelectorDATA16();1532 _aImportTab[i].offObject = aTstFakers[i].uAddress - (unsigned)&DATA16START;1554 aImportTab[i].usSel = GetSelectorDATA16(); 1555 aImportTab[i].offObject = aTstFakers[i].uAddress - (unsigned)&DATA16START; 1533 1556 break; 1534 1557 default: -
branches/GRACE/src/win32k/elf2lx/elf2lx.cpp
r2924 r4162 1 /* $Id: elf2lx.cpp,v 1.3 2000-02-27 02:13:19bird Exp $1 /* $Id: elf2lx.cpp,v 1.3.4.1 2000-09-02 20:49:13 bird Exp $ 2 2 * 3 3 * Elf2Lx - implementation. … … 28 28 #include <newexe.h> /* OS/2 NE structs and definitions. */ 29 29 #include <exe386.h> /* OS/2 LX structs and definitions. */ 30 31 #include "devSegDf.h" /* Win32k segment definitions. */ 30 32 31 33 #include "malloc.h" /* win32k malloc (resident). Not C library! */ -
branches/GRACE/src/win32k/include/options.h
r4107 r4162 1 /* $Id: options.h,v 1.10.4. 3 2000-08-28 22:42:38bird Exp $1 /* $Id: options.h,v 1.10.4.4 2000-09-02 20:49:15 bird Exp $ 2 2 * 3 3 * Options. … … 52 52 (unsigned short)~0, /* usVerMajor */ \ 53 53 (unsigned short)~0, /* usVerMinor */ \ 54 FLAGS_PE_ PE2LX, /* fPE */ \54 FLAGS_PE_MIXED, /* fPE */ \ 55 55 INFOLEVEL_QUIET, /* ulInfoLevel */ \ 56 56 FALSE, /* fElf */ \ … … 131 131 #pragma pack() 132 132 133 134 133 /******************************************************************************* 135 134 * Global Variables * 136 135 *******************************************************************************/ 137 extern struct options options; /* defined in d32globals.c */136 extern struct options DATA16_GLOBAL options; /* defined in d16globals.c */ 138 137 #if defined(__IBMC__) || defined(__IBMCPP__) 139 138 #pragma map( options , "_options" ) -
branches/GRACE/src/win32k/include/probkrnl.h
r4117 r4162 1 /* $Id: probkrnl.h,v 1.13.4. 9 2000-08-30 04:11:30bird Exp $1 /* $Id: probkrnl.h,v 1.13.4.10 2000-09-02 20:49:15 bird Exp $ 2 2 * 3 3 * Include file for ProbKrnl. … … 97 97 * NOTE! These are only available at init time! * 98 98 *******************************************************************************/ 99 extern IMPORTKRNLSYM _aImportTab[NBR_OF_KRNLIMPORTS]; /* 'aImportTab' in PrbKrnl.c */ 100 extern KRNLDBENTRY aKrnlSymDB[]; /* defined in symdb.c (for 16-bit usage) */ 101 extern KRNLDBENTRY _aKrnlSymDB[]; /* defined in symdb.c (for 32-bit usage) */ 99 extern IMPORTKRNLSYM DATA16_GLOBAL aImportTab[NBR_OF_KRNLIMPORTS]; /* Defined in ProbKrnl.c */ 100 extern char DATA16_GLOBAL szUsrSym[50]; /* Defined in ProbKrnl.c */ 101 extern KRNLDBENTRY DATA16_INIT aKrnlSymDB[]; /* Defined in symdb.c (for 16-bit usage) */ 102 103 #if defined(__IBMC__) || defined(__IBMCPP__) 104 #pragma map( aImportTab , "_aImportTab" ) 105 #pragma map( szUsrSym , "_szUsrSym" ) 106 #pragma map( aKrnlSymDB , "_aKrnlSymDB" ) 107 #endif 102 108 103 109 #if defined(INCL_16) && defined(MAX_DISKDD_CMD) /* 16-bit only */ 104 110 int ProbeKernel(PRPINITIN pReqPack); 111 112 #if 0 /*ndef CODE16_INIT*/ 113 #pragma alloc_text(CODE16_INIT, ProbeKernel) 105 114 #endif 106 115 107 116 #endif 108 117 118 #endif 119 -
branches/GRACE/src/win32k/k32/k32AllocMemEx.cpp
r4112 r4162 1 /* $Id: k32AllocMemEx.cpp,v 1.2.4. 1 2000-08-29 19:47:02bird Exp $1 /* $Id: k32AllocMemEx.cpp,v 1.2.4.2 2000-09-02 20:49:16 bird Exp $ 2 2 * 3 3 * k32AllocMemEx - Equivalent to DosAllocMem, but this one … … 29 29 *******************************************************************************/ 30 30 #include <os2.h> 31 #include "devSegDf.h" /* Win32k segment definitions. */ 31 32 #include "OS2Krnl.h" 32 33 #include "win32k.h" -
branches/GRACE/src/win32k/ldr/ModuleBase.cpp
r4090 r4162 1 /* $Id: ModuleBase.cpp,v 1.3.4. 2 2000-08-25 04:47:23bird Exp $1 /* $Id: ModuleBase.cpp,v 1.3.4.3 2000-09-02 20:49:17 bird Exp $ 2 2 * 3 3 * ModuleBase - Implementetation. … … 25 25 #include <os2.h> /* OS/2 header file. */ 26 26 27 #include "malloc.h" /* win32k malloc. Not C library! */ 27 #include "devSegDf.h" /* Win32k segment definitions. */ 28 #include "malloc.h" /* Win32k malloc. Not C library! */ 28 29 29 30 #include <string.h> /* C library string.h. */ -
branches/GRACE/src/win32k/ldr/ldr.cpp
r4090 r4162 1 /* $Id: ldr.cpp,v 1.7.4. 4 2000-08-25 04:47:24bird Exp $1 /* $Id: ldr.cpp,v 1.7.4.5 2000-09-02 20:49:17 bird Exp $ 2 2 * 3 3 * ldr.cpp - Loader helpers. … … 22 22 #include <os2.h> 23 23 24 #include "devSegDf.h" 24 25 #include "malloc.h" 25 26 #include "new.h" -
branches/GRACE/src/win32k/ldr/myldrEnum32bitRelRecs.cpp
r3834 r4162 1 /* $Id: myldrEnum32bitRelRecs.cpp,v 1.2.4. 1 2000-07-16 22:43:36bird Exp $1 /* $Id: myldrEnum32bitRelRecs.cpp,v 1.2.4.2 2000-09-02 20:49:19 bird Exp $ 2 2 * 3 3 * myldrEnum32bitRelRecs - ldrEnum32bitRelRecs … … 24 24 #include <stdlib.h> 25 25 26 #include "devSegDf.h" /* Win32k segment definitions. */ 26 27 #include "avl.h" 27 28 #include "log.h" -
branches/GRACE/src/win32k/ldr/myldrOpen.cpp
r4117 r4162 1 /* $Id: myldrOpen.cpp,v 1.10.4.1 1 2000-08-30 04:11:31bird Exp $1 /* $Id: myldrOpen.cpp,v 1.10.4.12 2000-09-02 20:49:19 bird Exp $ 2 2 * 3 3 * myldrOpen - ldrOpen. … … 26 26 #include <os2.h> 27 27 28 #include "devSegDf.h" /* Win32k segment definitions. */ 28 29 #include "rmalloc.h" 29 30 #include "malloc.h" -
branches/GRACE/src/win32k/ldr/myldrOpenPath.cpp
r4090 r4162 1 /* $Id: myldrOpenPath.cpp,v 1.1.2. 3 2000-08-25 04:47:25bird Exp $1 /* $Id: myldrOpenPath.cpp,v 1.1.2.4 2000-09-02 20:49:20 bird Exp $ 2 2 * 3 3 * myldrOpenPath - ldrOpenPath used to open executables we'll override … … 26 26 #include <stdlib.h> 27 27 28 #include "devSegDf.h" /* Win32k segment definitions. */ 28 29 #include "log.h" 29 30 #include "dev32.h" -
branches/GRACE/src/win32k/ldr/myldrRead.cpp
r3834 r4162 1 /* $Id: myldrRead.cpp,v 1.6.4. 1 2000-07-16 22:43:38bird Exp $1 /* $Id: myldrRead.cpp,v 1.6.4.2 2000-09-02 20:49:20 bird Exp $ 2 2 * 3 3 * myldrRead - ldrRead. … … 23 23 #include <stdlib.h> 24 24 25 #include "devSegDf.h" /* Win32k segment definitions. */ 25 26 #include "log.h" 26 27 #include "avl.h" -
branches/GRACE/src/win32k/misc/OS2KTCB.c
r3829 r4162 1 /* $Id: OS2KTCB.c,v 1.1 2000-07-16 22:21:17bird Exp $1 /* $Id: OS2KTCB.c,v 1.1.2.1 2000-09-02 20:49:21 bird Exp $ 2 2 * 3 3 * TCB - Thread Control Block access methods. … … 15 15 #include <os2.h> 16 16 #include <OS2KTCB.h> 17 #include "devSegDf.h" /* Win32k segment definitions. */ 17 18 #include "options.h" 18 19 -
branches/GRACE/src/win32k/misc/env.c
r3834 r4162 1 /* $Id: env.c,v 1.2.4. 1 2000-07-16 22:43:39bird Exp $1 /* $Id: env.c,v 1.2.4.2 2000-09-02 20:49:21 bird Exp $ 2 2 * 3 3 * Environment access functions … … 21 21 #include <os2.h> 22 22 23 #include "devSegDf.h" /* Win32k segment definitions. */ 23 24 #include "dev32.h" 24 25 #include "dev32hlp.h" -
branches/GRACE/src/win32k/misc/vprintf.c
r3834 r4162 1 /* $Id: vprintf.c,v 1.7.4. 1 2000-07-16 22:43:41bird Exp $1 /* $Id: vprintf.c,v 1.7.4.2 2000-09-02 20:49:24 bird Exp $ 2 2 * 3 3 * vprintf and printf … … 47 47 #include <stdarg.h> 48 48 49 #include "devSegDf.h" /* Win32k segment definitions. */ 49 50 #include "dev32.h" 50 51 #include "vprintf.h" -
branches/GRACE/src/win32k/pe2lx/pe2lx.cpp
r4141 r4162 1 /* $Id: pe2lx.cpp,v 1.18.4.1 1 2000-09-01 08:01:37bird Exp $1 /* $Id: pe2lx.cpp,v 1.18.4.12 2000-09-02 20:49:25 bird Exp $ 2 2 * 3 3 * Pe2Lx class implementation. Ring 0 and Ring 3 … … 80 80 #include <newexe.h> /* OS/2 NE structs and definitions. */ 81 81 #include <exe386.h> /* OS/2 LX structs and definitions. */ 82 83 #include "devSegDf.h" /* Win32k segment definitions. */ 82 84 83 85 #include "malloc.h" /* win32k malloc (resident). Not C library! */ -
branches/GRACE/src/win32k/test/dos.c
r3829 r4162 1 /* $Id: dos.c,v 1.1 2000-07-16 22:18:14bird Exp $1 /* $Id: dos.c,v 1.1.4.1 2000-09-02 20:49:28 bird Exp $ 2 2 * 3 3 * Thunkers for OS/2 APIs. … … 22 22 *******************************************************************************/ 23 23 #include <os2.h> 24 25 #include "devSegDf.h" /* Win32k segment definitions. */ 24 26 25 27 #include "test.h" -
branches/GRACE/src/win32k/test/fake.c
r4117 r4162 1 /* $Id: fake.c,v 1.1.4. 5 2000-08-30 04:11:32bird Exp $1 /* $Id: fake.c,v 1.1.4.6 2000-09-02 20:49:28 bird Exp $ 2 2 * 3 3 * Fake stubs for the ldr and kernel functions we imports or overloads. … … 28 28 29 29 #include <string.h> 30 31 #include "devSegDf.h" /* Win32k segment definitions. */ 30 32 31 33 #include "log.h" -
branches/GRACE/src/win32k/test/win32ktst.c
r4117 r4162 1 /* $Id: win32ktst.c,v 1.1.4. 7 2000-08-30 04:11:33bird Exp $1 /* $Id: win32ktst.c,v 1.1.4.8 2000-09-02 20:49:29 bird Exp $ 2 2 * 3 3 * Win32k test module. … … 34 34 #include <os2.h> 35 35 #include <exe386.h> 36 37 #include "devSegDf.h" /* Win32k segment definitions. */ 36 38 37 39 #include "malloc.h" … … 736 738 int rc = 1; 737 739 RP32INIT rpinit; 738 char * pszInitArgs = "-C1 -L:N -Verbose -Quiet -Elf:Yes -Pe:PE -Script:Yes - W4 -Heap:512000 -ResHeap:0256000 -HeapMax:4096000 -ResHeapMax:0x100000";740 char * pszInitArgs = "-C1 -L:N -Verbose -Quiet -Elf:Yes -Pe:PE -Script:Yes -Rexx:NES -Java:NYes -W4 -Heap:512000 -ResHeap:0256000 -HeapMax:4096000 -ResHeapMax:0x100000"; 739 741 740 742 /* $elf */ … … 757 759 opt.fElf = TRUE; 758 760 opt.fUNIXScript = TRUE; 761 opt.fJava = FALSE; 762 opt.fREXXScript = FALSE; 759 763 opt.fPE = FLAGS_PE_PE; 760 764 opt.fQuiet = TRUE; -
branches/GRACE/src/win32k/win32k.def
r4005 r4162 11 11 12 12 SEGMENTS 13 DATA16 class 'FAR_DATA' 14 DATA16_BSS class 'FAR_DATA' 15 DATA16_CONST class 'FAR_DATA' 16 CODE16 class 'CODE' 17 CODE16_IOSEG class 'CODE' 18 CODE32 class 'CODE' 19 DATA32 class 'DATA' 20 c_common class 'DATA' 21 BSS32 class 'BSS' 22 _VFT class 'CONST' 23 CONST32_RO class 'CONST' 24 CALLTAB class 'DATA' 13 DATA16 class 'FAR_DATA' 14 DATA16_BSS class 'FAR_DATA' 15 DATA16_CONST class 'FAR_DATA' 16 DATA16_GLOBAL class 'FAR_DATA' 17 DATA16_INIT class 'FAR_DATA' 18 DATA16_INIT_BSS class 'FAR_DATA' 19 DATA16_INIT_CONST class 'FAR_DATA' 25 20 21 CODE16 class 'CODE' 22 CODE16_IOSEG class 'CODE' 23 CODE16_INIT class 'CODE' 24 25 CODE32 class 'CODE' 26 27 DATA32 class 'DATA' 28 c_common class 'DATA' 29 BSS32 class 'BSS' 30 _VFT class 'CONST' 31 CONST32_RO class 'CONST' 32 CALLTAB class 'DATA' 33 -
branches/GRACE/src/win32k/win32ktst.def
r4010 r4162 12 12 13 13 SEGMENTS 14 DATA16 class 'FAR_DATA' 15 DATA16_BSS class 'FAR_DATA' 16 DATA16_CONST class 'FAR_DATA' 17 CODE16 class 'CODE' 18 CODE32 class 'CODE' 19 CALLTAB class 'DATA' 20 DATA32 class 'DATA' 21 c_common class 'DATA' 22 DDE4_DATA32 class 'DATA' 23 CTOR_DTOR1 class 'DATA' 24 CTOR_DTOR2 class 'DATA' 25 CTOR_DTOR3 class 'DATA' 26 _VFT class 'CONST' 27 CONST32_RO class 'CONST' 28 EH_DATA class 'CONST' 29 BSS32 class 'BSS' 14 DATA16 class 'FAR_DATA' 15 DATA16_BSS class 'FAR_DATA' 16 DATA16_CONST class 'FAR_DATA' 17 DATA16_GLOBAL class 'FAR_DATA' 18 DATA16_INIT class 'FAR_DATA' 19 DATA16_INIT_BSS class 'FAR_DATA' 20 DATA16_INIT_CONST class 'FAR_DATA' 21 22 CODE16 class 'CODE' 23 CODE16_IOSEG class 'CODE' 24 CODE16_INIT class 'CODE' 25 26 CODE32 class 'CODE' 27 CALLTAB class 'DATA' 28 DATA32 class 'DATA' 29 c_common class 'DATA' 30 DDE4_DATA32 class 'DATA' 31 CTOR_DTOR1 class 'DATA' 32 CTOR_DTOR2 class 'DATA' 33 CTOR_DTOR3 class 'DATA' 34 _VFT class 'CONST' 35 CONST32_RO class 'CONST' 36 EH_DATA class 'CONST' 37 BSS32 class 'BSS' 30 38 31 39 IMPORTS
Note:
See TracChangeset
for help on using the changeset viewer.