Ros-diffs March 2005

ros-diffs@reactos.org

26 participants
609 discussions

[gvg] 14055: Sync to Wine-20050310:

by gvg＠svn.reactos.com

Sync to Wine-20050310: Merge back WineHQ commits Modified: trunk/reactos/tools/wpp/lex.yy.c Modified: trunk/reactos/tools/wpp/ppl.l _____ Modified: trunk/reactos/tools/wpp/lex.yy.c --- trunk/reactos/tools/wpp/lex.yy.c 2005-03-14 10:39:23 UTC (rev 14054) +++ trunk/reactos/tools/wpp/lex.yy.c 2005-03-14 10:44:46 UTC (rev 14055) @@ -16,7 +16,7 @@ #define yytext pptext #define yywrap ppwrap -#line 20 "wpp/lex.yy.c" +#line 20 "lex.yy.c" /* A lexical scanner generated by flex */ /* Scanner skeleton version: @@ -13707,9 +13707,9 @@ 470, 471, 472, 483, 484, 488, 489, 501, 505, 514, 520, 521, 522, 523, 524, 525, 530, 531, 532, 533, - 538, 546, 547, 548, 549, 572, 573, 587, 588, 594, - 618, 619, 628, 673, 674, 675, 676, 677, 683, 685, - 691, 693, 701 + 538, 546, 547, 548, 549, 571, 572, 586, 587, 593, + 617, 618, 627, 672, 673, 674, 675, 676, 682, 684, + 690, 692, 700 } ; /* The intent behind this definition is that it'll catch @@ -13720,7 +13720,7 @@ #define YY_MORE_ADJ 0 #define YY_RESTORE_YY_MORE_OFFSET char *yytext; -#line 1 "wpp/ppl.l" +#line 1 "ppl.l" #define INITIAL 0 /* * Wrc preprocessor lexical analysis @@ -13893,7 +13893,7 @@ #define RCINCL 21 -#line 159 "wpp/ppl.l" +#line 159 "ppl.l" #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -14031,7 +14031,7 @@ * The scanner starts here ************************************************************************ ** */ -#line 14035 "wpp/lex.yy.c" +#line 14035 "lex.yy.c" /* Macros after this point can all be overridden by user definitions in * section 1. @@ -14196,7 +14196,7 @@ register char *yy_cp, *yy_bp; register int yy_act; -#line 299 "wpp/ppl.l" +#line 299 "ppl.l" /* * Catch line-continuations. @@ -14210,7 +14210,7 @@ /* * Detect the leading # of a preprocessor directive. */ -#line 14214 "wpp/lex.yy.c" +#line 14214 "lex.yy.c" if ( yy_init ) { @@ -14299,7 +14299,7 @@ case 1: YY_RULE_SETUP -#line 312 "wpp/ppl.l" +#line 312 "ppl.l" pp_incl_state.seen_junk++; yy_push_state(pp_pp); YY_BREAK /* @@ -14307,107 +14307,107 @@ */ case 2: YY_RULE_SETUP -#line 317 "wpp/ppl.l" +#line 317 "ppl.l" if(yy_top_state() != pp_ignore) {yy_pp_state(pp_inc); return tINCLUDE;} else {yy_pp_state(pp_eol);} YY_BREAK case 3: YY_RULE_SETUP -#line 318 "wpp/ppl.l" +#line 318 "ppl.l" if(yy_top_state() != pp_ignore) {yy_pp_state(pp_inc); return tINCLUDE_NEXT;} else {yy_pp_state(pp_eol);} YY_BREAK case 4: YY_RULE_SETUP -#line 319 "wpp/ppl.l" +#line 319 "ppl.l" yy_pp_state(yy_current_state() != pp_ignore ? pp_def : pp_eol); YY_BREAK case 5: YY_RULE_SETUP -#line 320 "wpp/ppl.l" +#line 320 "ppl.l" yy_pp_state(pp_eol); if(yy_top_state() != pp_ignore) return tERROR; YY_BREAK case 6: YY_RULE_SETUP -#line 321 "wpp/ppl.l" +#line 321 "ppl.l" yy_pp_state(pp_eol); if(yy_top_state() != pp_ignore) return tWARNING; YY_BREAK case 7: YY_RULE_SETUP -#line 322 "wpp/ppl.l" +#line 322 "ppl.l" yy_pp_state(pp_eol); if(yy_top_state() != pp_ignore) return tPRAGMA; YY_BREAK case 8: YY_RULE_SETUP -#line 323 "wpp/ppl.l" +#line 323 "ppl.l" yy_pp_state(pp_eol); if(yy_top_state() != pp_ignore) return tPPIDENT; YY_BREAK case 9: YY_RULE_SETUP -#line 324 "wpp/ppl.l" +#line 324 "ppl.l" if(yy_top_state() != pp_ignore) {yy_pp_state(pp_ifd); return tUNDEF;} else {yy_pp_state(pp_eol);} YY_BREAK case 10: YY_RULE_SETUP -#line 325 "wpp/ppl.l" +#line 325 "ppl.l" yy_pp_state(pp_ifd); return tIFDEF; YY_BREAK case 11: YY_RULE_SETUP -#line 326 "wpp/ppl.l" +#line 326 "ppl.l" pp_incl_state.seen_junk--; yy_pp_state(pp_ifd); return tIFNDEF; YY_BREAK case 12: YY_RULE_SETUP -#line 327 "wpp/ppl.l" +#line 327 "ppl.l" yy_pp_state(pp_if); return tIF; YY_BREAK case 13: YY_RULE_SETUP -#line 328 "wpp/ppl.l" +#line 328 "ppl.l" yy_pp_state(pp_if); return tELIF; YY_BREAK case 14: YY_RULE_SETUP -#line 329 "wpp/ppl.l" +#line 329 "ppl.l" yy_pp_state(pp_endif); return tELSE; YY_BREAK case 15: YY_RULE_SETUP -#line 330 "wpp/ppl.l" +#line 330 "ppl.l" yy_pp_state(pp_endif); return tENDIF; YY_BREAK case 16: YY_RULE_SETUP -#line 331 "wpp/ppl.l" +#line 331 "ppl.l" if(yy_top_state() != pp_ignore) {yy_pp_state(pp_line); return tLINE;} else {yy_pp_state(pp_eol);} YY_BREAK case 17: YY_RULE_SETUP -#line 332 "wpp/ppl.l" +#line 332 "ppl.l" if(yy_top_state() != pp_ignore) {yy_pp_state(pp_line); return tGCCLINE;} else {yy_pp_state(pp_eol);} YY_BREAK case 18: YY_RULE_SETUP -#line 333 "wpp/ppl.l" +#line 333 "ppl.l" pperror("Invalid preprocessor token '%s'", pptext); YY_BREAK case 19: YY_RULE_SETUP -#line 334 "wpp/ppl.l" +#line 334 "ppl.l" newline(1); yy_pop_state(); return tNL; /* This could be the null-token */ YY_BREAK case 20: YY_RULE_SETUP -#line 335 "wpp/ppl.l" +#line 335 "ppl.l" newline(0); YY_BREAK case 21: YY_RULE_SETUP -#line 336 "wpp/ppl.l" +#line 336 "ppl.l" pperror("Preprocessor junk '%s'", pptext); YY_BREAK case 22: YY_RULE_SETUP -#line 337 "wpp/ppl.l" +#line 337 "ppl.l" return *pptext; YY_BREAK /* @@ -14415,37 +14415,37 @@ */ case 23: YY_RULE_SETUP -#line 342 "wpp/ppl.l" +#line 342 "ppl.l" return make_number(10, &pplval, pptext, ppleng); YY_BREAK case 24: YY_RULE_SETUP -#line 343 "wpp/ppl.l" +#line 343 "ppl.l" new_string(); add_string(pptext, ppleng); yy_push_state(pp_iqs); YY_BREAK case 25: YY_RULE_SETUP -#line 344 "wpp/ppl.l" +#line 344 "ppl.l" new_string(); add_string(pptext, ppleng); yy_push_state(pp_dqs); YY_BREAK case 26: YY_RULE_SETUP -#line 345 "wpp/ppl.l" +#line 345 "ppl.l" ; YY_BREAK case 27: YY_RULE_SETUP -#line 346 "wpp/ppl.l" +#line 346 "ppl.l" newline(1); yy_pop_state(); return tNL; YY_BREAK case 28: YY_RULE_SETUP -#line 347 "wpp/ppl.l" +#line 347 "ppl.l" newline(0); YY_BREAK case 29: YY_RULE_SETUP -#line 348 "wpp/ppl.l" +#line 348 "ppl.l" pperror(yy_current_state() == pp_inc ? "Trailing junk in #include" : "Trailing junk in #line"); YY_BREAK /* @@ -14453,22 +14453,22 @@ */ case 30: YY_RULE_SETUP -#line 353 "wpp/ppl.l" +#line 353 "ppl.l" ; YY_BREAK case 31: YY_RULE_SETUP -#line 354 "wpp/ppl.l" +#line 354 "ppl.l" newline(1); YY_BREAK case 32: YY_RULE_SETUP -#line 355 "wpp/ppl.l" +#line 355 "ppl.l" newline(0); YY_BREAK case 33: YY_RULE_SETUP -#line 356 "wpp/ppl.l" +#line 356 "ppl.l" ; YY_BREAK /* @@ -14479,107 +14479,107 @@ */ case 34: YY_RULE_SETUP -#line 365 "wpp/ppl.l" +#line 365 "ppl.l" return make_number(8, &pplval, pptext, ppleng); YY_BREAK case 35: YY_RULE_SETUP -#line 366 "wpp/ppl.l" +#line 366 "ppl.l" pperror("Invalid octal digit"); YY_BREAK case 36: YY_RULE_SETUP -#line 367 "wpp/ppl.l" +#line 367 "ppl.l" return make_number(10, &pplval, pptext, ppleng); YY_BREAK case 37: YY_RULE_SETUP -#line 368 "wpp/ppl.l" +#line 368 "ppl.l" return make_number(16, &pplval, pptext, ppleng); YY_BREAK case 38: YY_RULE_SETUP -#line 369 "wpp/ppl.l" +#line 369 "ppl.l" pperror("Invalid hex number"); YY_BREAK case 39: YY_RULE_SETUP -#line 370 "wpp/ppl.l" +#line 370 "ppl.l" yy_push_state(pp_defined); return tDEFINED; YY_BREAK case 40: YY_RULE_SETUP -#line 371 "wpp/ppl.l" +#line 371 "ppl.l" return tLSHIFT; YY_BREAK case 41: YY_RULE_SETUP -#line 372 "wpp/ppl.l" +#line 372 "ppl.l" return tRSHIFT; YY_BREAK case 42: YY_RULE_SETUP -#line 373 "wpp/ppl.l" +#line 373 "ppl.l" return tLOGAND; YY_BREAK case 43: YY_RULE_SETUP -#line 374 "wpp/ppl.l" +#line 374 "ppl.l" return tLOGOR; YY_BREAK case 44: YY_RULE_SETUP -#line 375 "wpp/ppl.l" +#line 375 "ppl.l" return tEQ; YY_BREAK case 45: YY_RULE_SETUP -#line 376 "wpp/ppl.l" +#line 376 "ppl.l" return tNE; YY_BREAK case 46: YY_RULE_SETUP -#line 377 "wpp/ppl.l" +#line 377 "ppl.l" return tLTE; YY_BREAK case 47: YY_RULE_SETUP -#line 378 "wpp/ppl.l" +#line 378 "ppl.l" return tGTE; YY_BREAK case 48: YY_RULE_SETUP -#line 379 "wpp/ppl.l" +#line 379 "ppl.l" newline(1); yy_pop_state(); return tNL; YY_BREAK case 49: YY_RULE_SETUP -#line 380 "wpp/ppl.l" +#line 380 "ppl.l" newline(0); YY_BREAK case 50: YY_RULE_SETUP -#line 381 "wpp/ppl.l" +#line 381 "ppl.l" pperror("Junk in conditional expression"); YY_BREAK case 51: YY_RULE_SETUP -#line 382 "wpp/ppl.l" +#line 382 "ppl.l" ; YY_BREAK case 52: YY_RULE_SETUP -#line 383 "wpp/ppl.l" +#line 383 "ppl.l" new_string(); add_string(pptext, ppleng); yy_push_state(pp_sqs); YY_BREAK case 53: YY_RULE_SETUP -#line 384 "wpp/ppl.l" +#line 384 "ppl.l" pperror("String constants not allowed in conditionals"); YY_BREAK case 54: YY_RULE_SETUP -#line 385 "wpp/ppl.l" +#line 385 "ppl.l" return *pptext; YY_BREAK /* @@ -14588,27 +14588,27 @@ */ case 55: YY_RULE_SETUP -#line 391 "wpp/ppl.l" +#line 391 "ppl.l" pplval.cptr = pp_xstrdup(pptext); return tIDENT; YY_BREAK case 56: YY_RULE_SETUP -#line 392 "wpp/ppl.l" +#line 392 "ppl.l" ; YY_BREAK case 57: YY_RULE_SETUP -#line 393 "wpp/ppl.l" +#line 393 "ppl.l" newline(1); yy_pop_state(); return tNL; YY_BREAK case 58: YY_RULE_SETUP -#line 394 "wpp/ppl.l" +#line 394 "ppl.l" newline(0); YY_BREAK case 59: YY_RULE_SETUP -#line 395 "wpp/ppl.l" +#line 395 "ppl.l" pperror("Identifier expected"); YY_BREAK /* @@ -14616,22 +14616,22 @@ */ case 60: YY_RULE_SETUP -#line 400 "wpp/ppl.l" +#line 400 "ppl.l" ; YY_BREAK case 61: YY_RULE_SETUP -#line 401 "wpp/ppl.l" +#line 401 "ppl.l" newline(1); yy_pop_state(); return tNL; YY_BREAK case 62: YY_RULE_SETUP -#line 402 "wpp/ppl.l" +#line 402 "ppl.l" newline(0); YY_BREAK case 63: YY_RULE_SETUP -#line 403 "wpp/ppl.l" +#line 403 "ppl.l" pperror("Garbage after #else or #endif."); YY_BREAK /* @@ -14641,27 +14641,27 @@ */ case 64: YY_RULE_SETUP -#line 410 "wpp/ppl.l" +#line 410 "ppl.l" yy_pop_state(); pplval.cptr = pp_xstrdup(pptext); return tIDENT; YY_BREAK case 65: YY_RULE_SETUP -#line 411 "wpp/ppl.l" +#line 411 "ppl.l" ; YY_BREAK case 66: YY_RULE_SETUP -#line 412 "wpp/ppl.l" +#line 412 "ppl.l" return *pptext; YY_BREAK case 67: YY_RULE_SETUP -#line 413 "wpp/ppl.l" +#line 413 "ppl.l" newline(0); YY_BREAK case 68: YY_RULE_SETUP -#line 414 "wpp/ppl.l" +#line 414 "ppl.l" pperror("Identifier expected"); YY_BREAK /* @@ -14672,27 +14672,27 @@ */ case 69: YY_RULE_SETUP -#line 422 "wpp/ppl.l" +#line 422 "ppl.l" if(yy_top_state() != pp_ignore) { pplval.cptr = pp_xstrdup(pptext); return tLITERAL; } YY_BREAK case 70: YY_RULE_SETUP -#line 423 "wpp/ppl.l" +#line 423 "ppl.l" if(yy_top_state() != pp_ignore) { pplval.cptr = pp_xstrdup(pptext); return tLITERAL; } YY_BREAK case 71: YY_RULE_SETUP -#line 424 "wpp/ppl.l" +#line 424 "ppl.l" if(yy_top_state() != pp_ignore) { pplval.cptr = pp_xstrdup(pptext); return tLITERAL; } YY_BREAK case 72: YY_RULE_SETUP -#line 425 "wpp/ppl.l" +#line 425 "ppl.l" newline(1); yy_pop_state(); if(yy_current_state() != pp_ignore) { return tNL; } YY_BREAK case 73: YY_RULE_SETUP -#line 426 "wpp/ppl.l" +#line 426 "ppl.l" newline(0); YY_BREAK /* @@ -14700,27 +14700,27 @@ */ case 74: YY_RULE_SETUP -#line 431 "wpp/ppl.l" +#line 431 "ppl.l" pplval.cptr = pp_xstrdup(pptext); pplval.cptr[ppleng-1] = '\0'; yy_pp_state(pp_macro); return tMACRO; YY_BREAK case 75: YY_RULE_SETUP -#line 432 "wpp/ppl.l" +#line 432 "ppl.l" pplval.cptr = pp_xstrdup(pptext); yy_pp_state(pp_define); return tDEFINE; YY_BREAK case 76: YY_RULE_SETUP -#line 433 "wpp/ppl.l" +#line 433 "ppl.l" ; YY_BREAK case 77: YY_RULE_SETUP -#line 434 "wpp/ppl.l" +#line 434 "ppl.l" newline(0); YY_BREAK case 78: YY_RULE_SETUP -#line 435 "wpp/ppl.l" +#line 435 "ppl.l" perror("Identifier expected"); YY_BREAK /* @@ -14728,37 +14728,37 @@ */ case 79: YY_RULE_SETUP -#line 440 "wpp/ppl.l" +#line 440 "ppl.l" pplval.cptr = pp_xstrdup(pptext); return tLITERAL; YY_BREAK case 80: YY_RULE_SETUP -#line 441 "wpp/ppl.l" +#line 441 "ppl.l" pplval.cptr = pp_xstrdup(pptext); return tLITERAL; YY_BREAK case 81: YY_RULE_SETUP -#line 442 "wpp/ppl.l" +#line 442 "ppl.l" newline(0); pplval.cptr = pp_xstrdup(" "); return tLITERAL; YY_BREAK case 82: YY_RULE_SETUP -#line 443 "wpp/ppl.l" +#line 443 "ppl.l" newline(0); YY_BREAK case 83: YY_RULE_SETUP -#line 444 "wpp/ppl.l" +#line 444 "ppl.l" newline(1); yy_pop_state(); return tNL; YY_BREAK case 84: YY_RULE_SETUP -#line 445 "wpp/ppl.l" +#line 445 "ppl.l" new_string(); add_string(pptext, ppleng); yy_push_state(pp_sqs); YY_BREAK case 85: YY_RULE_SETUP -#line 446 "wpp/ppl.l" +#line 446 "ppl.l" new_string(); add_string(pptext, ppleng); yy_push_state(pp_dqs); YY_BREAK /* @@ -14766,37 +14766,37 @@ */ case 86: YY_RULE_SETUP -#line 451 "wpp/ppl.l" +#line 451 "ppl.l" yy_pp_state(pp_mbody); return tMACROEND; YY_BREAK case 87: YY_RULE_SETUP -#line 452 "wpp/ppl.l" +#line 452 "ppl.l" ; YY_BREAK case 88: YY_RULE_SETUP -#line 453 "wpp/ppl.l" +#line 453 "ppl.l" pplval.cptr = pp_xstrdup(pptext); return tIDENT; YY_BREAK case 89: YY_RULE_SETUP -#line 454 "wpp/ppl.l" +#line 454 "ppl.l" return ','; YY_BREAK case 90: YY_RULE_SETUP -#line 455 "wpp/ppl.l" +#line 455 "ppl.l" return tELIPSIS; YY_BREAK case 91: YY_RULE_SETUP -#line 456 "wpp/ppl.l" +#line 456 "ppl.l" pperror("Argument identifier expected"); YY_BREAK case 92: YY_RULE_SETUP -#line 457 "wpp/ppl.l" +#line 457 "ppl.l" newline(0); YY_BREAK /* @@ -14804,57 +14804,57 @@ */ case 93: YY_RULE_SETUP -#line 462 "wpp/ppl.l" +#line 462 "ppl.l" pplval.cptr = pp_xstrdup(pptext); return tLITERAL; YY_BREAK case 94: YY_RULE_SETUP -#line 463 "wpp/ppl.l" +#line 463 "ppl.l" pplval.cptr = pp_xstrdup(pptext); return tIDENT; YY_BREAK case 95: YY_RULE_SETUP -#line 464 "wpp/ppl.l" +#line 464 "ppl.l" return tCONCAT; YY_BREAK case 96: YY_RULE_SETUP -#line 465 "wpp/ppl.l" +#line 465 "ppl.l" return tSTRINGIZE; YY_BREAK case 97: YY_RULE_SETUP -#line 466 "wpp/ppl.l" +#line 466 "ppl.l" pplval.cptr = pp_xstrdup(pptext); return tLITERAL; YY_BREAK case 98: YY_RULE_SETUP -#line 467 "wpp/ppl.l" +#line 467 "ppl.l" pplval.cptr = pp_xstrdup(pptext); return tLITERAL; YY_BREAK case 99: YY_RULE_SETUP -#line 468 "wpp/ppl.l" +#line 468 "ppl.l" newline(0); pplval.cptr = pp_xstrdup(" "); return tLITERAL; YY_BREAK case 100: YY_RULE_SETUP -#line 469 "wpp/ppl.l" +#line 469 "ppl.l" newline(0); YY_BREAK case 101: YY_RULE_SETUP -#line 470 "wpp/ppl.l" +#line 470 "ppl.l" newline(1); yy_pop_state(); return tNL; YY_BREAK case 102: YY_RULE_SETUP -#line 471 "wpp/ppl.l" +#line 471 "ppl.l" new_string(); add_string(pptext, ppleng); yy_push_state(pp_sqs); YY_BREAK case 103: YY_RULE_SETUP -#line 472 "wpp/ppl.l" +#line 472 "ppl.l" new_string(); add_string(pptext, ppleng); yy_push_state(pp_dqs); YY_BREAK /* @@ -14871,12 +14871,12 @@ yy_c_buf_p = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 483 "wpp/ppl.l" +#line 483 "ppl.l" yy_pp_state(pp_macscan); YY_BREAK case 105: YY_RULE_SETUP -#line 484 "wpp/ppl.l" +#line 484 "ppl.l" { if(yy_top_state() != pp_macscan) newline(0); @@ -14884,12 +14884,12 @@ YY_BREAK case 106: YY_RULE_SETUP -#line 488 "wpp/ppl.l" +#line 488 "ppl.l" newline(0); YY_BREAK case 107: YY_RULE_SETUP -#line 489 "wpp/ppl.l" +#line 489 "ppl.l" { macexpstackentry_t *mac = pop_macro(); yy_pop_state(); @@ -14904,7 +14904,7 @@ */ case 108: YY_RULE_SETUP -#line 501 "wpp/ppl.l" +#line 501 "ppl.l" { if(++MACROPARENTHESES() > 1) add_text_to_macro(pptext, ppleng); @@ -14912,7 +14912,7 @@ YY_BREAK case 109: YY_RULE_SETUP -#line 505 "wpp/ppl.l" +#line 505 "ppl.l" { if(--MACROPARENTHESES() == 0) { @@ -14925,7 +14925,7 @@ YY_BREAK case 110: YY_RULE_SETUP -#line 514 "wpp/ppl.l" +#line 514 "ppl.l" { if(MACROPARENTHESES() > 1) add_text_to_macro(pptext, ppleng); @@ -14935,32 +14935,32 @@ YY_BREAK case 111: YY_RULE_SETUP -#line 520 "wpp/ppl.l" +#line 520 "ppl.l" new_string(); add_string(pptext, ppleng); yy_push_state(pp_dqs); YY_BREAK case 112: YY_RULE_SETUP -#line 521 "wpp/ppl.l" +#line 521 "ppl.l" new_string(); add_string(pptext, ppleng); yy_push_state(pp_sqs); YY_BREAK case 113: YY_RULE_SETUP -#line 522 "wpp/ppl.l" +#line 522 "ppl.l" yy_push_state(pp_comment); add_text_to_macro(" ", 1); YY_BREAK case 114: YY_RULE_SETUP -#line 523 "wpp/ppl.l" +#line 523 "ppl.l" pp_status.line_number++; pp_status.char_number = 1; add_text_to_macro(pptext, ppleng); YY_BREAK case 115: YY_RULE_SETUP -#line 524 "wpp/ppl.l" +#line 524 "ppl.l" add_text_to_macro(pptext, ppleng); YY_BREAK case 116: YY_RULE_SETUP -#line 525 "wpp/ppl.l" +#line 525 "ppl.l" newline(0); YY_BREAK /* @@ -14968,22 +14968,22 @@ */ case 117: YY_RULE_SETUP -#line 530 "wpp/ppl.l" +#line 530 "ppl.l" yy_push_state(pp_comment); YY_BREAK case 118: YY_RULE_SETUP -#line 531 "wpp/ppl.l" +#line 531 "ppl.l" ; YY_BREAK case 119: YY_RULE_SETUP -#line 532 "wpp/ppl.l" +#line 532 "ppl.l" newline(0); YY_BREAK case 120: YY_RULE_SETUP -#line 533 "wpp/ppl.l" +#line 533 "ppl.l" yy_pop_state(); YY_BREAK /* @@ -14991,7 +14991,7 @@ */ case 121: YY_RULE_SETUP -#line 538 "wpp/ppl.l" +#line 538 "ppl.l" { if(pptext[ppleng-1] == '\\') ppwarning("C++ style comment ends with an escaped newline (escape ignored)"); @@ -15002,22 +15002,22 @@ */ case 122: YY_RULE_SETUP -#line 546 "wpp/ppl.l" +#line 546 "ppl.l" pp_incl_state.seen_junk++; new_string(); add_string(pptext, ppleng); yy_push_state(pp_dqs); YY_BREAK case 123: YY_RULE_SETUP -#line 547 "wpp/ppl.l" +#line 547 "ppl.l" pp_incl_state.seen_junk++; new_string(); add_string(pptext, ppleng); yy_push_state(pp_sqs); YY_BREAK case 124: YY_RULE_SETUP -#line 548 "wpp/ppl.l" +#line 548 "ppl.l" add_string(pptext, ppleng); YY_BREAK case 125: YY_RULE_SETUP -#line 549 "wpp/ppl.l" +#line 549 "ppl.l" { add_string(pptext, ppleng); yy_pop_state(); @@ -15035,7 +15035,6 @@ pplval.cptr = get_string(); if (is_c_h_include(pplval.cptr, 1)) pass_data=0; else pass_data=1; -//fprintf(stderr, "%s pass_data %d\n", pplval.cptr, pass_data); return tDQSTRING; default: put_string(); @@ -15044,12 +15043,12 @@ YY_BREAK case 126: YY_RULE_SETUP -#line 572 "wpp/ppl.l" +#line 571 "ppl.l" add_string(pptext, ppleng); YY_BREAK case 127: YY_RULE_SETUP -#line 573 "wpp/ppl.l" +#line 572 "ppl.l" { add_string(pptext, ppleng); yy_pop_state(); @@ -15067,12 +15066,12 @@ YY_BREAK case 128: YY_RULE_SETUP -#line 587 "wpp/ppl.l" +#line 586 "ppl.l" add_string(pptext, ppleng); YY_BREAK case 129: YY_RULE_SETUP -#line 588 "wpp/ppl.l" +#line 587 "ppl.l" { add_string(pptext, ppleng); yy_pop_state(); @@ -15082,7 +15081,7 @@ YY_BREAK case 130: YY_RULE_SETUP -#line 594 "wpp/ppl.l" +#line 593 "ppl.l" { /* * This is tricky; we need to remove the line-continuation @@ -15110,12 +15109,12 @@ YY_BREAK case 131: YY_RULE_SETUP -#line 618 "wpp/ppl.l" +#line 617 "ppl.l" add_string(pptext, ppleng); YY_BREAK case 132: YY_RULE_SETUP -#line 619 "wpp/ppl.l" +#line 618 "ppl.l" { newline(1); add_string(pptext, ppleng); @@ -15127,7 +15126,7 @@ */ case 133: YY_RULE_SETUP -#line 628 "wpp/ppl.l" +#line 627 "ppl.l" { pp_entry_t *ppp; pp_incl_state.seen_junk++; @@ -15175,27 +15174,27 @@ */ case 134: YY_RULE_SETUP -#line 673 "wpp/ppl.l" +#line 672 "ppl.l" pp_incl_state.seen_junk++; put_buffer(pptext, ppleng); YY_BREAK case 135: YY_RULE_SETUP -#line 674 "wpp/ppl.l" +#line 673 "ppl.l" put_buffer(pptext, ppleng); YY_BREAK case 136: YY_RULE_SETUP -#line 675 "wpp/ppl.l" +#line 674 "ppl.l" newline(1); YY_BREAK case 137: YY_RULE_SETUP -#line 676 "wpp/ppl.l" +#line 675 "ppl.l" newline(0); YY_BREAK case 138: YY_RULE_SETUP -#line 677 "wpp/ppl.l" +#line 676 "ppl.l" pp_incl_state.seen_junk++; put_buffer(pptext, ppleng); YY_BREAK /* @@ -15204,12 +15203,12 @@ */ case 139: YY_RULE_SETUP -#line 683 "wpp/ppl.l" +#line 682 "ppl.l" put_buffer(pptext, ppleng); YY_BREAK case 140: [truncated at 1000 lines; 91 more skipped]

19 years, 6 months

[gvg] 14054: Sync to Wine-20050310

by gvg＠svn.reactos.com

Sync to Wine-20050310 Deleted: trunk/reactos/tools/unicode/c_21866.c Added: trunk/reactos/tools/unicode/c_21866.c _____ Deleted: trunk/reactos/tools/unicode/c_21866.c --- trunk/reactos/tools/unicode/c_21866.c 2005-03-14 10:36:02 UTC (rev 14053) +++ trunk/reactos/tools/unicode/c_21866.c 2005-03-14 10:39:23 UTC (rev 14054) @@ -1,716 +0,0 @@ -/* code page 21866 (Ukrainian KOI8) */ -/* generated from ftp.unicode.org/Public/MAPPINGS/VENDORS/MISC/KOI8-U.TXT */ -/* DO NOT EDIT!! */ - -#include "wine/unicode.h" - -static const WCHAR cp2uni[256] = -{ - 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, - 0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f, - 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, - 0x0018, 0x0019, 0x001a, 0x001b, 0x001c, 0x001d, 0x001e, 0x001f, - 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, - 0x0028, 0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f, - 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, - 0x0038, 0x0039, 0x003a, 0x003b, 0x003c, 0x003d, 0x003e, 0x003f, - 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, - 0x0048, 0x0049, 0x004a, 0x004b, 0x004c, 0x004d, 0x004e, 0x004f, - 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, - 0x0058, 0x0059, 0x005a, 0x005b, 0x005c, 0x005d, 0x005e, 0x005f, - 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, - 0x0068, 0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e, 0x006f, - 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, - 0x0078, 0x0079, 0x007a, 0x007b, 0x007c, 0x007d, 0x007e, 0x007f, - 0x2500, 0x2502, 0x250c, 0x2510, 0x2514, 0x2518, 0x251c, 0x2524, - 0x252c, 0x2534, 0x253c, 0x2580, 0x2584, 0x2588, 0x258c, 0x2590, - 0x2591, 0x2592, 0x2593, 0x2320, 0x25a0, 0x2219, 0x221a, 0x2248, - 0x2264, 0x2265, 0x00a0, 0x2321, 0x00b0, 0x00b2, 0x00b7, 0x00f7, - 0x2550, 0x2551, 0x2552, 0x0451, 0x0454, 0x2554, 0x0456, 0x0457, - 0x2557, 0x2558, 0x2559, 0x255a, 0x255b, 0x0491, 0x045e, 0x255e, - 0x255f, 0x2560, 0x2561, 0x0401, 0x0404, 0x2563, 0x0406, 0x0407, - 0x2566, 0x2567, 0x2568, 0x2569, 0x256a, 0x0490, 0x040e, 0x00a9, - 0x044e, 0x0430, 0x0431, 0x0446, 0x0434, 0x0435, 0x0444, 0x0433, - 0x0445, 0x0438, 0x0439, 0x043a, 0x043b, 0x043c, 0x043d, 0x043e, - 0x043f, 0x044f, 0x0440, 0x0441, 0x0442, 0x0443, 0x0436, 0x0432, - 0x044c, 0x044b, 0x0437, 0x0448, 0x044d, 0x0449, 0x0447, 0x044a, - 0x042e, 0x0410, 0x0411, 0x0426, 0x0414, 0x0415, 0x0424, 0x0413, - 0x0425, 0x0418, 0x0419, 0x041a, 0x041b, 0x041c, 0x041d, 0x041e, - 0x041f, 0x042f, 0x0420, 0x0421, 0x0422, 0x0423, 0x0416, 0x0412, - 0x042c, 0x042b, 0x0417, 0x0428, 0x042d, 0x0429, 0x0427, 0x042a -}; - -static const unsigned char uni2cp_low[4864] = -{ - /* 0x0000 .. 0x00ff */ - 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, - 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, - 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, - 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, - 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, - 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, - 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, - 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, - 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, - 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, - 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, - 0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f, - 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, - 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, - 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, - 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x9a, 0x21, 0x63, 0x4c, 0x3f, 0x59, 0x7c, 0x3f, - 0x22, 0xbf, 0x61, 0x3c, 0x3f, 0x2d, 0x72, 0x2d, - 0x9c, 0x3f, 0x9d, 0x33, 0x27, 0x75, 0x3f, 0x9e, - 0x2c, 0x31, 0x6f, 0x3e, 0x3f, 0x3f, 0x3f, 0x3f, - 0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x43, - 0x45, 0x45, 0x45, 0x45, 0x49, 0x49, 0x49, 0x49, - 0x44, 0x4e, 0x4f, 0x4f, 0x4f, 0x4f, 0x4f, 0x78, - 0x4f, 0x55, 0x55, 0x55, 0x55, 0x59, 0x3f, 0x3f, - 0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 0x63, - 0x65, 0x65, 0x65, 0x65, 0x69, 0x69, 0x69, 0x69, - 0x64, 0x6e, 0x6f, 0x6f, 0x6f, 0x6f, 0x6f, 0x9f, - 0x6f, 0x75, 0x75, 0x75, 0x75, 0x79, 0x3f, 0x79, - /* 0x0100 .. 0x01ff */ - 0x41, 0x61, 0x41, 0x61, 0x41, 0x61, 0x43, 0x63, - 0x43, 0x63, 0x43, 0x63, 0x43, 0x63, 0x44, 0x64, - 0x44, 0x64, 0x45, 0x65, 0x45, 0x65, 0x45, 0x65, - 0x45, 0x65, 0x45, 0x65, 0x47, 0x67, 0x47, 0x67, - 0x47, 0x67, 0x47, 0x67, 0x48, 0x68, 0x48, 0x68, - 0x49, 0x69, 0x49, 0x69, 0x49, 0x69, 0x49, 0x69, - 0x49, 0x69, 0x3f, 0x3f, 0x4a, 0x6a, 0x4b, 0x6b, - 0x3f, 0x4c, 0x6c, 0x4c, 0x6c, 0x4c, 0x6c, 0x3f, - 0x3f, 0x4c, 0x6c, 0x4e, 0x6e, 0x4e, 0x6e, 0x4e, - 0x6e, 0x3f, 0x3f, 0x3f, 0x4f, 0x6f, 0x4f, 0x6f, - 0x4f, 0x6f, 0x4f, 0x6f, 0x52, 0x72, 0x52, 0x72, - 0x52, 0x72, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, - 0x53, 0x73, 0x54, 0x74, 0x54, 0x74, 0x54, 0x74, - 0x55, 0x75, 0x55, 0x75, 0x55, 0x75, 0x55, 0x75, - 0x55, 0x75, 0x55, 0x75, 0x57, 0x77, 0x59, 0x79, - 0x59, 0x5a, 0x7a, 0x5a, 0x7a, 0x5a, 0x7a, 0x73, - 0x62, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x44, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x45, 0x46, 0x66, 0x3f, 0x3f, 0x3f, 0x3f, 0x49, - 0x3f, 0x3f, 0x6c, 0x3f, 0x3f, 0x3f, 0x3f, 0x4f, - 0x4f, 0x6f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x74, 0x3f, 0x3f, 0x54, 0x55, - 0x75, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x7a, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x81, 0x3f, 0x3f, 0x21, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x41, 0x61, 0x49, - 0x69, 0x4f, 0x6f, 0x55, 0x75, 0x55, 0x75, 0x55, - 0x75, 0x55, 0x75, 0x55, 0x75, 0x3f, 0x41, 0x61, - 0x41, 0x61, 0x41, 0x61, 0x47, 0x67, 0x47, 0x67, - 0x4b, 0x6b, 0x4f, 0x6f, 0x4f, 0x6f, 0x3f, 0x3f, - 0x6a, 0x3f, 0x3f, 0x3f, 0x47, 0x67, 0x3f, 0x3f, - 0x4e, 0x6e, 0x41, 0x61, 0x41, 0x61, 0x4f, 0x6f, - /* 0x0200 .. 0x02ff */ - 0x41, 0x61, 0x41, 0x61, 0x45, 0x65, 0x45, 0x65, - 0x49, 0x69, 0x49, 0x69, 0x4f, 0x6f, 0x4f, 0x6f, - 0x52, 0x72, 0x52, 0x72, 0x55, 0x75, 0x55, 0x75, - 0x53, 0x73, 0x54, 0x74, 0x3f, 0x3f, 0x48, 0x68, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x41, 0x61, - 0x45, 0x65, 0x4f, 0x6f, 0x4f, 0x6f, 0x4f, 0x6f, - 0x4f, 0x6f, 0x59, 0x79, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x67, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x68, 0x3f, 0x6a, 0x72, 0x3f, 0x3f, 0x3f, 0x77, - 0x79, 0x27, 0x22, 0x60, 0x27, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x5e, 0x3f, 0x5e, 0x76, - 0x27, 0x2d, 0x27, 0x60, 0x3f, 0x5f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x9c, 0x3f, 0x7e, 0x22, 0x3f, 0x3f, - 0x3f, 0x6c, 0x73, 0x78, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - /* 0x0300 .. 0x03ff */ - 0x60, 0x27, 0x5e, 0x7e, 0x2d, 0x2d, 0x3f, 0x3f, - 0x22, 0x3f, 0x9c, 0x22, 0x76, 0x3f, 0x22, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x2c, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x5f, 0x5f, 0x5f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x60, 0x27, 0x3f, 0x3f, 0x22, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x27, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3b, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x27, 0x22, 0x41, 0x9e, - 0x45, 0x48, 0x49, 0x3f, 0x4f, 0x3f, 0x59, 0x3f, - 0x3f, 0x41, 0x42, 0x3f, 0x3f, 0x45, 0x5a, 0x48, - 0x3f, 0x49, 0x4b, 0x3f, 0x4d, 0x4e, 0x3f, 0x4f, - 0x3f, 0x50, 0x3f, 0x3f, 0x54, 0x59, 0x3f, 0x58, - 0x3f, 0x3f, 0x49, 0x59, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x75, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x59, 0x59, 0x59, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - /* 0x0400 .. 0x04ff */ - 0xe5, 0xb3, 0x3f, 0xe7, 0xb4, 0x3f, 0xb6, 0xb7, - 0x3f, 0x3f, 0x3f, 0x3f, 0xeb, 0xe9, 0xbe, 0x3f, - 0xe1, 0xe2, 0xf7, 0xe7, 0xe4, 0xe5, 0xf6, 0xfa, - 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, 0xf0, - 0xf2, 0xf3, 0xf4, 0xf5, 0xe6, 0xe8, 0xe3, 0xfe, - 0xfb, 0xfd, 0xff, 0xf9, 0xf8, 0xfc, 0xe0, 0xf1, - 0xc1, 0xc2, 0xd7, 0xc7, 0xc4, 0xc5, 0xd6, 0xda, - 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, - 0xd2, 0xd3, 0xd4, 0xd5, 0xc6, 0xc8, 0xc3, 0xde, - 0xdb, 0xdd, 0xdf, 0xd9, 0xd8, 0xdc, 0xc0, 0xd1, - 0xc5, 0xa3, 0x3f, 0xc7, 0xa4, 0x3f, 0xa6, 0xa7, - 0x3f, 0x3f, 0x3f, 0x3f, 0xcb, 0xc9, 0xae, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0xbd, 0xad, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0xf6, 0xd6, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0xe1, 0xc1, 0xe1, 0xc1, 0x3f, 0x3f, 0xe5, 0xc5, - 0x3f, 0x3f, 0x3f, 0x3f, 0xf6, 0xd6, 0xfa, 0xda, - 0x3f, 0x3f, 0xe9, 0xc9, 0xe9, 0xc9, 0xef, 0xcf, - 0x3f, 0x3f, 0x3f, 0x3f, 0xfc, 0xdc, 0xf5, 0xd5, - 0xf5, 0xd5, 0xf5, 0xd5, 0xfe, 0xde, 0x3f, 0x3f, - 0xf9, 0xd9, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - /* 0x1d00 .. 0x1dff */ - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x41, 0x41, 0x42, 0x3f, - 0x44, 0x45, 0x3f, 0x47, 0x48, 0x49, 0x4a, 0x4b, - 0x4c, 0x4d, 0x4e, 0x3f, 0x4f, 0x3f, 0x50, 0x52, - 0x54, 0x55, 0x57, 0x61, 0x3f, 0x3f, 0x3f, 0x62, - 0x64, 0x65, 0x3f, 0x3f, 0x3f, 0x67, 0x3f, 0x6b, - 0x6d, 0x3f, 0x6f, 0x3f, 0x3f, 0x3f, 0x70, 0x74, - 0x75, 0x3f, 0x3f, 0x76, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x69, 0x72, 0x75, 0x76, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - /* 0x1e00 .. 0x1eff */ - 0x41, 0x61, 0x42, 0x62, 0x42, 0x62, 0x42, 0x62, - 0x43, 0x63, 0x44, 0x64, 0x44, 0x64, 0x44, 0x64, - 0x44, 0x64, 0x44, 0x64, 0x45, 0x65, 0x45, 0x65, - 0x45, 0x65, 0x45, 0x65, 0x45, 0x65, 0x46, 0x66, - 0x47, 0x67, 0x48, 0x68, 0x48, 0x68, 0x48, 0x68, - 0x48, 0x68, 0x48, 0x68, 0x49, 0x69, 0x49, 0x69, - 0x4b, 0x6b, 0x4b, 0x6b, 0x4b, 0x6b, 0x4c, 0x6c, - 0x4c, 0x6c, 0x4c, 0x6c, 0x4c, 0x6c, 0x4d, 0x6d, - 0x4d, 0x6d, 0x4d, 0x6d, 0x4e, 0x6e, 0x4e, 0x6e, - 0x4e, 0x6e, 0x4e, 0x6e, 0x4f, 0x6f, 0x4f, 0x6f, - 0x4f, 0x6f, 0x4f, 0x6f, 0x50, 0x70, 0x50, 0x70, - 0x52, 0x72, 0x52, 0x72, 0x52, 0x72, 0x52, 0x72, - 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, - 0x53, 0x73, 0x54, 0x74, 0x54, 0x74, 0x54, 0x74, - 0x54, 0x74, 0x55, 0x75, 0x55, 0x75, 0x55, 0x75, - 0x55, 0x75, 0x55, 0x75, 0x56, 0x76, 0x56, 0x76, - 0x57, 0x77, 0x57, 0x77, 0x57, 0x77, 0x57, 0x77, - 0x57, 0x77, 0x58, 0x78, 0x58, 0x78, 0x59, 0x79, - 0x5a, 0x7a, 0x5a, 0x7a, 0x5a, 0x7a, 0x68, 0x74, - 0x77, 0x79, 0x3f, 0x73, 0x3f, 0x3f, 0x3f, 0x3f, - 0x41, 0x61, 0x41, 0x61, 0x41, 0x61, 0x41, 0x61, - 0x41, 0x61, 0x41, 0x61, 0x41, 0x61, 0x41, 0x61, - 0x41, 0x61, 0x41, 0x61, 0x41, 0x61, 0x41, 0x61, - 0x45, 0x65, 0x45, 0x65, 0x45, 0x65, 0x45, 0x65, - 0x45, 0x65, 0x45, 0x65, 0x45, 0x65, 0x45, 0x65, - 0x49, 0x69, 0x49, 0x69, 0x4f, 0x6f, 0x4f, 0x6f, - 0x4f, 0x6f, 0x4f, 0x6f, 0x4f, 0x6f, 0x4f, 0x6f, - 0x4f, 0x6f, 0x4f, 0x6f, 0x4f, 0x6f, 0x4f, 0x6f, - 0x4f, 0x6f, 0x4f, 0x6f, 0x55, 0x75, 0x55, 0x75, - 0x55, 0x75, 0x55, 0x75, 0x55, 0x75, 0x55, 0x75, - 0x55, 0x75, 0x59, 0x79, 0x59, 0x79, 0x59, 0x79, - 0x59, 0x79, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - /* 0x1f00 .. 0x1fff */ - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x41, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x45, 0x45, 0x45, 0x45, 0x45, 0x45, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x48, 0x48, 0x48, 0x48, 0x48, 0x48, 0x48, 0x48, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x49, 0x49, 0x49, 0x49, 0x49, 0x49, 0x49, 0x49, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x4f, 0x4f, 0x4f, 0x4f, 0x4f, 0x4f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x59, 0x3f, 0x59, 0x3f, 0x59, 0x3f, 0x59, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x41, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x48, 0x48, 0x48, 0x48, 0x48, 0x48, 0x48, 0x48, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x41, 0x41, 0x41, 0x41, 0x41, 0x3f, 0x3f, 0x3f, - 0x3f, 0x22, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x45, 0x45, 0x48, 0x48, 0x48, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x49, 0x49, 0x49, 0x49, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x59, 0x59, 0x59, 0x59, 0x50, 0x22, 0x22, 0x60, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x4f, 0x4f, 0x3f, 0x3f, 0x3f, 0x27, 0x3f, 0x3f, - /* 0x2000 .. 0x20ff */ - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x2d, 0x2d, 0x3f, 0x2d, 0x2d, 0x2d, 0x3f, 0x5f, - 0x60, 0x27, 0x2c, 0x60, 0x22, 0x22, 0x2c, 0x3f, - 0x3f, 0x3f, 0x95, 0x3f, 0x2e, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x20, - 0x3f, 0x3f, 0x27, 0x22, 0x3f, 0x60, 0x3f, 0x3f, - 0x3f, 0x3c, 0x3e, 0x3f, 0x21, 0x3f, 0x2d, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x2f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x20, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x9c, 0x69, 0x3f, 0x3f, 0x34, 0x35, 0x36, 0x37, - 0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x6e, - 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, - 0x38, 0x39, 0x2b, 0x2d, 0x3d, 0x28, 0x29, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x63, 0x3f, 0x3f, 0x4c, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - /* 0x2100 .. 0x21ff */ - 0x3f, 0x3f, 0x43, 0x3f, 0x3f, 0x3f, 0x3f, 0x45, - 0x3f, 0x3f, 0x67, 0x48, 0x48, 0x48, 0x68, 0x68, - 0x49, 0x49, 0x4c, 0x6c, 0x3f, 0x4e, 0x3f, 0x3f, - 0x50, 0x50, 0x51, 0x52, 0x52, 0x52, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x5a, 0x3f, 0x3f, 0x3f, - 0x5a, 0x3f, 0x4b, 0x41, 0x42, 0x43, 0x65, 0x65, - 0x45, 0x46, 0x3f, 0x4d, 0x6f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x69, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x44, 0x64, 0x65, - 0x69, 0x6a, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x49, 0x3f, 0x3f, 0x3f, 0x56, 0x3f, 0x3f, 0x3f, - 0x3f, 0x58, 0x3f, 0x3f, 0x4c, 0x43, 0x44, 0x4d, - 0x69, 0x3f, 0x3f, 0x3f, 0x76, 0x3f, 0x3f, 0x3f, - 0x3f, 0x78, 0x3f, 0x3f, 0x6c, 0x63, 0x64, 0x6d, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3c, 0x5e, 0x3e, 0x76, 0x2d, 0x7c, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3c, 0x3e, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x2d, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - /* 0x2200 .. 0x22ff */ - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x4f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x2d, 0x3f, 0x3f, 0x2f, 0x5c, 0x2a, - 0x9c, 0x95, 0x96, 0x3f, 0x3f, 0x3f, 0x3f, 0x4c, - 0x3f, 0x3f, 0x3f, 0x7c, 0x7c, 0x3f, 0x3f, 0x3f, - 0x3f, 0x6e, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3a, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x7e, 0x3f, 0x3f, 0x3f, - 0x3f, 0x7e, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x97, 0x97, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3d, 0x3d, 0x3d, 0x3d, 0x98, 0x99, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3c, 0x3e, 0x3f, 0x3f, 0x3c, 0x3e, - 0x98, 0x99, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x9e, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - /* 0x2300 .. 0x23ff */ - 0x3f, 0x3f, 0x3f, 0x5e, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x93, 0x9b, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3c, 0x3e, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - /* 0x2400 .. 0x24ff */ - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, - 0x39, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x41, 0x42, - 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4a, - 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, 0x50, 0x51, 0x52, - 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5a, - 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, - 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, - 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, - 0x79, 0x7a, 0x30, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - /* 0x2500 .. 0x25ff */ - 0x80, 0x80, 0x81, 0x81, 0x2d, 0x2d, 0x7c, 0x7c, - 0x2d, 0x2d, 0x7c, 0x7c, 0x82, 0x82, 0x82, 0x82, - 0x83, 0x83, 0x83, 0x83, 0x84, 0x84, 0x84, 0x84, - 0x85, 0x85, 0x85, 0x85, 0x86, 0x86, 0x86, 0x86, - 0x86, 0x86, 0x86, 0x86, 0x87, 0x87, 0x87, 0x87, - 0x87, 0x87, 0x87, 0x87, 0x88, 0x88, 0x88, 0x88, - 0x88, 0x88, 0x88, 0x88, 0x89, 0x89, 0x89, 0x89, - 0x89, 0x89, 0x89, 0x89, 0x8a, 0x8a, 0x8a, 0x8a, - 0x8a, 0x8a, 0x8a, 0x8a, 0x8a, 0x8a, 0x8a, 0x8a, - 0x8a, 0x8a, 0x8a, 0x8a, 0x2d, 0x2d, 0x7c, 0x7c, - 0xa0, 0xa1, 0xa2, 0xa2, 0xa5, 0xa8, 0xa8, 0xa8, - 0xa9, 0xaa, 0xab, 0xac, 0xac, 0xac, 0xaf, 0xb0, - 0xb1, 0xb2, 0xb2, 0xb5, 0xb8, 0xb8, 0xb8, 0xb9, - 0xba, 0xbb, 0xbc, 0xbc, 0xbc, 0x3f, 0x3f, 0x3f, - 0x3f, 0x2f, 0x5c, 0x58, 0x2d, 0x7c, 0x2d, 0x7c, - 0x2d, 0x7c, 0x2d, 0x7c, 0x2d, 0x7c, 0x2d, 0x7c, - 0x8b, 0x3f, 0x3f, 0x3f, 0x8c, 0x3f, 0x3f, 0x3f, - 0x8d, 0x3f, 0x3f, 0x3f, 0x8e, 0x3f, 0x3f, 0x3f, - 0x8f, 0x90, 0x91, 0x92, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x94, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x4f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x4f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - /* 0x3000 .. 0x30ff */ - 0x20, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3c, 0x3e, 0x3c, 0x3e, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x5b, 0x5d, 0x3f, 0x22, 0x22, 0x2c, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - /* 0xfb00 .. 0xfbff */ - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x2b, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - /* 0xfe00 .. 0xfeff */ - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x2d, 0x2d, 0x2d, 0x2d, 0x5f, 0x5f, 0x5f, - 0x2c, 0x3f, 0x2e, 0x3f, 0x3b, 0x3a, 0x3f, 0x21, - 0x2d, 0x28, 0x29, 0x7b, 0x7d, 0x3f, 0x3f, 0x23, - 0x26, 0x2a, 0x2b, 0x2d, 0x3c, 0x3e, 0x3d, 0x3f, - 0x5c, 0x24, 0x25, 0x40, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - /* 0xff00 .. 0xffff */ - 0x3f, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, - 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, - 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, - 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, - 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, - 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, - 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, - 0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f, - 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, - 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, - 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, - 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x63, 0x4c, 0x3f, 0x2d, 0x7c, 0x59, 0x3f, 0x3f, - 0x81, 0x3c, 0x5e, 0x3e, 0x76, 0x94, 0x4f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - /* defaults */ - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, - 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f -}; - -static const unsigned short uni2cp_high[256] = -{ - 0x0000, 0x0100, 0x0200, 0x0300, 0x0400, 0x1200, 0x1200, 0x1200, - 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, - 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, - 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x0500, 0x0600, 0x0700, - 0x0800, 0x0900, 0x0a00, 0x0b00, 0x0c00, 0x0d00, 0x1200, 0x1200, - 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, - 0x0e00, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, - 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, - 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, - 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, - 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, - 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, - 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, - 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, - 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, - 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, - 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, - 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, - 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, - 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, - 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, - 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, - 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, - 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, - 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, - 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, - 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, - 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, - 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, - 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, - 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, 0x1200, - 0x1200, 0x1200, 0x1200, 0x0f00, 0x1200, 0x1200, 0x1000, 0x1100 -}; - -const struct sbcs_table cptable_21866 = -{ - { 21866, 1, 0x003f, 0x003f, "Ukrainian KOI8" }, - cp2uni, - uni2cp_low, - uni2cp_high -}; _____ Copied: trunk/reactos/tools/unicode/c_21866.c (from rev 14053, vendor/wine/libs/unicode/current/c_21866.c) Property changes on: trunk/reactos/tools/unicode/c_21866.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native

19 years, 6 months

[gvg] 14053: Re-import because of SVN problems

by gvg＠svn.reactos.com

Re-import because of SVN problems Added: trunk/reactos/tools/winebuild/winebuild.man.in _____ Copied: trunk/reactos/tools/winebuild/winebuild.man.in (from rev 14052, vendor/wine/tools/winebuild/current/winebuild.man.in) --- vendor/wine/tools/winebuild/current/winebuild.man.in 2005-03-14 10:32:28 UTC (rev 14052) +++ trunk/reactos/tools/winebuild/winebuild.man.in 2005-03-14 10:36:02 UTC (rev 14053) @@ -0,0 +1,441 @@ +.\" -*- nroff -*- +.TH WINEBUILD 1 "March 2003" "@PACKAGE_STRING@" "Wine dll builder" +.SH NAME +winebuild \- Wine dll builder +.SH SYNOPSIS +.BI winebuild\ [options]\ [input\ files] +.SH DESCRIPTION +.B winebuild +generates the C and assembly files that are necessary to build a Wine +dll, which is basically a Win32 dll encapsulated inside a Unix +library. +.PP +.B winebuild +has different modes, depending on what kind of file it is asked to +generate. The mode is specified by one of the mode options specified +below. In addition to the mode option, various other command-line +option can be specified, as described in the \fBOPTIONS\fR section. +.SH "MODE OPTIONS" +You have to specify exactly one of the following options, depending on +what you want winebuild to generate. +.TP +.BI \--dll +Build a C file from a .spec file (see \fBSPEC FILE SYNTAX\fR for +details), or from a standard Windows .def file. The .spec/.def file +is specified via the -E option. The resulting C file must be compiled +and linked to the other object files to build a working Wine dll. +In this mode, the +.I input files +should be the list of all object files that will be linked into the +final dll, to allow +.B winebuild +to get the list of all undefined symbols that need to be imported from +other dlls. +.TP +.BI \--exe +Build a C file for an executable. This is basically the same as +the --dll mode except that it doesn't require a .spec/.def file as input, +since an executable need not export functions. Some executables however +do export functions, and for those a .spec/.def file can be specified via +the -E option. The executable is named from the .spec/.def file name if +present, or explicitly through the -F option. The resulting C file must be +compiled and linked to the other object files to build a working Wine +executable, and all the other object files must be listed as +.I input files. +.TP +.BI \--def +Build a .def file from a spec file. The .spec file is specified via the +-E option. This is used when building dlls with a PE (Win32) compiler. +.TP +.B \--debug +Build a C file containing the definitions for debugging channels. In +that mode the +.I input files +should be a list of C files to search for debug channel +definitions. The resulting C file must be compiled and linked with the +dll. +.TP +.B \--relay16 +Generate the assembly code for the 16-bit relay routines. This is for +Wine internal usage only, you should never need to use this option. +.TP +.B \--relay32 +Generate the assembly code for the 32-bit relay routines. This is for +Wine internal usage only, you should never need to use this option. +.SH OPTIONS +.TP +.BI \-C,\ --source-dir= directory +Change to the specified directory before reading source files. Only +meaningful in +.BR \--debug\ mode. +.TP +.BI \-D\ symbol +Ignored for compatibility with the C compiler. +.TP +.BI \-e,\ --entry= function +Specify the module entry point function; if not specified, the default +is +.B DllMain +for dlls, and +.B WinMain +for executables (if +.B WinMain +is not defined, the standard C +.B main +is used instead). This is only valid for Win32 modules. +.TP +.BI \-E,\ --export= filename +Specify a .spec file (see \fBSPEC FILE SYNTAX\fR for details), +or a standard Windows .def file that defines the exports +of the DLL or executable that is being built. +.TP +.BI \-f\ flags +Ignored for compatibility with the C compiler. +.TP +.BI \-F,\ --filename= filename +Set the file name of the module. The default is to use the base name +of the spec file (without any extension). +.TP +.B \-h, --help +Display a usage message and exit. +.TP +.BI \-H,\ --heap= size +Specify the size of the module local heap in bytes (only valid for +Win16 modules); default is no local heap. +.TP +.BI \-i,\ --ignore= [-]symbol[,[-]symbol] +Specify a list of symbols that should be ignored when resolving +undefined symbols against the imported libraries. This forces these +symbols to be resolved from the Unix C library (or from another Unix +library linked with the application). If a symbol is prefixed by '-' +it is removed from the list instead of being added; a stand-alone '-' +clears the whole list. +.TP +.BI \-I\ directory +Ignored for compatibility with the C compiler. +.TP +.B \-k, --kill-at +Remove the stdcall decorations from the symbol names in the +generated .def file. Only meaningful in \fB--def\fR mode. +.TP +.BI \-K\ flags +Ignored for compatibility with the C compiler. +.TP +.BI \--ld-cmd= ld-command +Specify the command to use to link the object files; the default is +\fBld\fR. +.TP +.BI \--nm-cmd= nm-command +Specify the command to use to get the list of undefined symbols; the +default is \fBnm\fR. +.TP +.BI \-L,\ --library-path= directory +Append the specified directory to the list of directories that are +searched for import libraries. +.TP +.BI \-l,\ --library= name +Import the specified library, looking for a corresponding +\fIlibname.def\fR file in the directories specified with the \fB-L\fR +option. +.TP +.BI \-d,\ --delay-lib= name +Same as the \fB-l\fR option, but import the specified library in +delayed mode (i.e. the library won't be loaded until a function +imported from it is actually called). +.TP +.BI \-M,\ --main-module= module +Specify that we are building a 16-bit dll, that will ultimately be +linked together with the 32-bit dll specified in \fImodule\fR. Only +meaningful in \fB--dll\fR mode. +.TP +.BI \-N,\ --dll-name= dllname +Set the internal name of the module. It is only used in Win16 +modules. The default is to use the base name of the spec file (without +any extension). This is used for KERNEL, since it lives in +KRNL386.EXE. It shouldn't be needed otherwise. +.TP +.BI \-o,\ --output= file +Set the name of the output file (default is standard output). +.TP +.BI \-r,\ --res= rsrc.res +Load resources from the specified binary resource file. The +\fIrsrc.res\fR can be produced from a source resource file with +.BR wrc(1) +(or with a Windows resource compiler). +.br +This option is only necessary for Win16 resource files, the Win32 ones +can simply listed as +.I input files +and will automatically be handled correctly (though the +.B \-r +option will also work for Win32 files). +.TP +.BI --subsystem= subsystem[:major[.minor]] +Set the subsystem of the executable, which can be one of the following: +.br +.B console +for a command line executable, +.br +.B windows +for a graphical executable, +.br +.B native +for a native-mode dll. +.br +The entry point of a command line executable is a normal C \fBmain\fR +function. A \fBwmain\fR function can be used instead if you need the +argument array to use Unicode strings. A graphical executable has a +\fBWinMain\fR entry point. +.br +Optionally a major and minor subsystem version can also be specified; +the default subsystem version is 4.0. +.TP +.B \--version +Display the program version and exit. +.TP +.B \-w, --warnings +Turn on warnings. +.SH "SPEC FILE SYNTAX" +.SS "General syntax" +A spec file should contain a list of ordinal declarations. The general +syntax is the following: +.PP +.I ordinal functype +.RI [ flags ]\ exportname \ \fB(\fR\ [ args... ] \ \fB) \ [ handler ] +.br +.IB ordinal\ variable +.RI [ flags ]\ exportname \ \fB(\fR\ [ data... ] \ \fB) +.br +.IB ordinal\ extern +.RI [ flags ]\ exportname \ [ symbolname ] +.br +.IB ordinal\ stub +.RI [ flags ]\ exportname +.br +.IB ordinal\ equate +.RI [ flags ]\ exportname\ data +.br +.BI #\ comments +.PP +Declarations must fit on a single line, except if the end of line is +escaped using a backslash character. The +.B # +character anywhere in a line causes the rest of the line to be ignored +as a comment. +.PP +.I ordinal +specifies the ordinal number corresponding to the entry point, or '@' +for automatic ordinal allocation (Win32 only). +.PP +.I flags +is a series of optional flags, preceded by a '-' character. The +supported flags are: +.RS +.TP +.B -norelay +The entry point is not displayed in relay debugging traces (Win32 +only). +.TP +.B -noname +The entry point will be imported by ordinal instead of by name. +.TP +.B -ret16 +The function returns a 16-bit value (Win16 only). +.TP +.B -ret64 +The function returns a 64-bit value (Win32 only). +.TP +.B -i386 +The entry point is only available on i386 platforms. +.TP +.B -register +The function uses CPU register to pass arguments. +.TP +.B -private +The function cannot be imported from other dlls, it can only be +accessed through GetProcAddress. +.SS "Function ordinals" +Syntax: +.br +.I ordinal functype +.RI [ flags ]\ exportname \ \fB(\fR\ [ args... ] \ \fB) \ [ handler ] +.br + +This declaration defines a function entry point. The prototype defined by +.IR exportname \ \fB(\fR\ [ args... ] \ \fB) +specifies the name available for dynamic linking and the format of the +arguments. '@' can be used instead of +.I exportname +for ordinal-only exports. +.PP +.I functype +should be one of: +.RS +.TP +.B stdcall +for a normal Win32 function +.TP +.B pascal +for a normal Win16 function +.TP +.B cdecl +for a Win16 or Win32 function using the C calling convention +.TP +.B varargs +for a Win16 or Win32 function using the C calling convention with a +variable number of arguments +.RE +.PP +.I args +should be one or several of: +.RS +.TP +.B word +(16-bit unsigned value) +.TP +.B s_word +(16-bit signed word) +.TP +.B long +(32-bit value) +.TP +.B double +(64-bit value) +.TP +.B ptr +(linear pointer) +.TP +.B str +(linear pointer to a null-terminated ASCII string) +.TP +.B wstr +(linear pointer to a null-terminated Unicode string) +.TP +.B segptr +(segmented pointer) +.TP +.B segstr +(segmented pointer to a null-terminated ASCII string). +.HP +.RB Only\ ptr ,\ str ,\ wstr ,\ long\ and\ double +are valid for Win32 functions. +.RE +.PP +.I handler +is the name of the actual C function that will implement that entry +point in 32-bit mode. The handler can also be specified as +.IB dllname . function +to define a forwarded function (one whose implementation is in another +dll). If +.I handler +is not specified, it is assumed to be identical to +.I exportname. +.PP +This first example defines an entry point for the 32-bit GetFocus() +call: +.IP +@ stdcall GetFocus() GetFocus +.PP +This second example defines an entry point for the 16-bit +CreateWindow() call (the ordinal 100 is just an example); it also +shows how long lines can be split using a backslash: +.IP +100 pascal CreateWindow(ptr ptr long s_word s_word s_word \\ + s_word word word word ptr) WIN_CreateWindow +.PP +To declare a function using a variable number of arguments, specify +the function as +.B varargs +and declare it in the C file with a '...' parameter for a Win32 +function, or with an extra VA_LIST16 argument for a Win16 function. +See the wsprintf* functions in user.exe.spec and user32.spec for an +example. +.SS "Variable ordinals" +Syntax: +.br +.IB ordinal\ variable +.RI [ flags ]\ exportname \ \fB(\fR\ [ data... ] \ \fB) +.PP +This declaration defines data storage as 32-bit words at the ordinal +specified. +.I exportname +will be the name available for dynamic +linking. +.I data +can be a decimal number or a hex number preceded by "0x". The +following example defines the variable VariableA at ordinal 2 and +containing 4 ints: +.IP +2 variable VariableA(-1 0xff 0 0) +.PP +This declaration only works in Win16 spec files. In Win32 you should +use +.B extern +instead (see below). +.SS "Extern ordinals" +Syntax: +.br +.IB ordinal\ extern +.RI [ flags ]\ exportname \ [ symbolname ] +.PP +This declaration defines an entry that simply maps to a C symbol +(variable or function). It only works in Win32 spec files. +.I exportname +will point to the symbol +.I symbolname +that must be defined in the C code. Alternatively, it can be of the +form +.IB dllname . symbolname +to define a forwarded symbol (one whose implementation is in another +dll). If +.I symbolname +is not specified, it is assumed to be identical to +.I exportname. +.SS "Stub ordinals" +Syntax: +.br +.IB ordinal\ stub +.RI [ flags ]\ exportname +.PP +This declaration defines a stub function. It makes the name and +ordinal available for dynamic linking, but will terminate execution +with an error message if the function is ever called. +.SS "Equate ordinals" +Syntax: +.br +.IB ordinal\ equate +.RI [ flags ]\ exportname\ data +.PP +This declaration defines an ordinal as an absolute value. +.I exportname +will be the name available for dynamic linking. +.I data +can be a decimal number or a hex number preceded by "0x". +.SH AUTHORS +.B winebuild +has been worked on by many people over the years. The main authors are +Robert J. Amstadt, Alexandre Julliard, Martin von Loewis, Ulrich +Weigand and Eric Youngdale. Many other Wine developers have +contributed, please check the file Changelog in the Wine distribution +for the complete details. +.SH BUGS +It is not yet possible to use a PE-format dll in an import +specification; only Wine dlls can be imported. +.PP +If you find a bug, please submit a bug report at +.UR http://bugs.winehq.org +.B http://bugs.winehq.org. +.UE +.SH AVAILABILITY +.B winebuild +is part of the wine distribution, which is available through WineHQ, +the +.B wine +development headquarters, at +.UR http://www.winehq.org/ +.B http://www.winehq.org/. +.UE +.SH "SEE ALSO" +.BR wine (1), +.BR winegcc (1), +.BR wrc (1). Property changes on: trunk/reactos/tools/winebuild/winebuild.man.in ___________________________________________________________________ Name: svn:eol-style + native

19 years, 6 months

[gvg] 14052: Sync to Wine-20050310:

by gvg＠svn.reactos.com

Sync to Wine-20050310: Dimitrie O. Paun <dpaun(a)rogers.com> - Add support for .exe's with exported functions. Modified: trunk/reactos/tools/helper.mk Modified: trunk/reactos/tools/winebuild/main.c Deleted: trunk/reactos/tools/winebuild/winebuild.man.in _____ Modified: trunk/reactos/tools/helper.mk --- trunk/reactos/tools/helper.mk 2005-03-14 10:12:00 UTC (rev 14051) +++ trunk/reactos/tools/helper.mk 2005-03-14 10:32:28 UTC (rev 14052) @@ -1134,7 +1134,7 @@ endif %.spec.def: %.spec $(HALFVERBOSEECHO) [DEF] $< - $(WINEBUILD) $(DEFS) -o $@ --def $< + $(WINEBUILD) $(DEFS) -o $@ --def -E $< %.drv.spec.def: %.spec $(HALFVERBOSEECHO) [DEF] $< $(WINEBUILD) $(DEFS) -o $@ --def $< _____ Modified: trunk/reactos/tools/winebuild/main.c --- trunk/reactos/tools/winebuild/main.c 2005-03-14 10:12:00 UTC (rev 14051) +++ trunk/reactos/tools/winebuild/main.c 2005-03-14 10:32:28 UTC (rev 14052) @@ -97,7 +97,6 @@ { if (!strcmp( p, ".spec" ) || !strcmp( p, ".def" )) *p = 0; } - if (!strchr( spec->file_name, '.' )) strcat( spec->file_name, ".dll" ); } /* set the dll subsystem */ @@ -143,6 +142,7 @@ " -C --source-dir=DIR Look for source files in DIR\n" " -d --delay-lib=LIB Import the specified library in delayed mode\n" " -D SYM Ignored for C flags compatibility\n" +" -E --export=FILE Export the symbols defined in the .spec or .def file\n" " -e --entry=FUNC Set the DLL entry point function (default: DllMain)\n" " -f FLAGS Compiler flags (only -fPIC is supported)\n" " -F --filename=DLLFILE Set the DLL filename (default: from input file name)\n" @@ -164,9 +164,9 @@ " --version Print the version and exit\n" " -w --warnings Turn on warnings\n" "\nMode options:\n" -" --dll=FILE Build a .c file from a .spec or .def file\n" -" --def=FILE.SPEC Build a .def file from a spec file\n" -" --exe=NAME Build a .c file for the named executable\n" +" --dll Build a .c file from a .spec or .def file\n" +" --def Build a .def file from a .spec file\n" +" --exe Build a .c file for an executable\n" " --debug [FILES] Build a .c file with the debug channels declarations\n" " --relay16 Build the 16-bit relay assembly routines\n" " --relay32 Build the 32-bit relay assembly routines\n" @@ -188,13 +188,13 @@ LONG_OPT_PEDLL }; -static const char short_options[] = "C:D:F:H:I:K:L:M:N:d:e:f:hi:kl:m:o:r:w"; +static const char short_options[] = "C:D:E:F:H:I:K:L:M:N:d:e:f:hi:kl:m:o:r:w"; static const struct option long_options[] = { - { "dll", 1, 0, LONG_OPT_DLL }, - { "def", 1, 0, LONG_OPT_DEF }, - { "exe", 1, 0, LONG_OPT_EXE }, + { "dll", 0, 0, LONG_OPT_DLL }, + { "def", 0, 0, LONG_OPT_DEF }, + { "exe", 0, 0, LONG_OPT_EXE }, { "debug", 0, 0, LONG_OPT_DEBUG }, { "ld-cmd", 1, 0, LONG_OPT_LDCMD }, { "nm-cmd", 1, 0, LONG_OPT_NMCMD }, @@ -206,6 +206,7 @@ /* aliases for short options */ { "source-dir", 1, 0, 'C' }, { "delay-lib", 1, 0, 'd' }, + { "export", 1, 0, 'E' }, { "entry", 1, 0, 'e' }, { "filename", 1, 0, 'F' }, { "help", 0, 0, 'h' }, @@ -250,6 +251,10 @@ case 'D': /* ignored */ break; + case 'E': + spec_file_name = xstrdup( optarg ); + set_dll_file_name( optarg, spec ); + break; case 'F': spec->file_name = xstrdup( optarg ); break; @@ -326,21 +331,12 @@ break; case LONG_OPT_DLL: set_exec_mode( MODE_DLL ); - spec_file_name = xstrdup( optarg ); - set_dll_file_name( optarg, spec ); break; case LONG_OPT_DEF: set_exec_mode( MODE_DEF ); - spec_file_name = xstrdup( optarg ); - set_dll_file_name( optarg, spec ); break; case LONG_OPT_EXE: set_exec_mode( MODE_EXE ); - if ((p = strrchr( optarg, '/' ))) p++; - else p = optarg; - spec->file_name = xmalloc( strlen(p) + 5 ); - strcpy( spec->file_name, p ); - if (!strchr( spec->file_name, '.' )) strcat( spec->file_name, ".exe" ); if (!spec->subsystem) spec->subsystem = IMAGE_SUBSYSTEM_WINDOWS_GUI; break; case LONG_OPT_DEBUG: @@ -374,6 +370,10 @@ break; } } + + if (spec->file_name && !strchr( spec->file_name, '.' )) + strcat( spec->file_name, exec_mode == MODE_EXE ? ".exe" : ".dll" ); + return &argv[optind]; } @@ -412,12 +412,14 @@ { FILE *input_file = open_input_file( NULL, spec_file_name ); char *extension = strrchr( spec_file_name, '.' ); + int result; if (extension && !strcmp( extension, ".def" )) - return parse_def_file( input_file, spec ); + result = parse_def_file( input_file, spec ); else - return parse_spec_file( input_file, spec ); + result = parse_spec_file( input_file, spec ); close_input_file( input_file ); + return result; } @@ -442,6 +444,7 @@ case MODE_DLL: spec->characteristics |= IMAGE_FILE_DLL; load_resources( argv, spec ); + if (!spec_file_name) fatal_error( "missing .spec file\n" ); if (!parse_input_file( spec )) break; switch (spec->type) { @@ -457,13 +460,16 @@ break; case MODE_EXE: if (spec->type == SPEC_WIN16) fatal_error( "Cannot build 16-bit exe files\n" ); + if (!spec->file_name) fatal_error( "executable must be named via the -F option\n" ); load_resources( argv, spec ); + if (spec_file_name && !parse_input_file( spec )) break; read_undef_symbols( argv ); BuildSpec32File( output_file, spec ); break; case MODE_DEF: if (argv[0]) fatal_error( "file argument '%s' not allowed in this mode\n", argv[0] ); if (spec->type == SPEC_WIN16) fatal_error( "Cannot yet build .def file for 16-bit dlls\n" ); + if (!spec_file_name) fatal_error( "missing .spec file\n" ); if (!parse_input_file( spec )) break; BuildDef32File( output_file, spec ); break; _____ Deleted: trunk/reactos/tools/winebuild/winebuild.man.in --- trunk/reactos/tools/winebuild/winebuild.man.in 2005-03-14 10:12:00 UTC (rev 14051) +++ trunk/reactos/tools/winebuild/winebuild.man.in 2005-03-14 10:32:28 UTC (rev 14052) @@ -1,434 +0,0 @@ -.\" -*- nroff -*- -.TH WINEBUILD 1 "March 2003" "@PACKAGE_STRING@" "Wine dll builder" -.SH NAME -winebuild \- Wine dll builder -.SH SYNOPSIS -.BI winebuild\ [options]\ [input\ files] -.SH DESCRIPTION -.B winebuild -generates the C and assembly files that are necessary to build a Wine -dll, which is basically a Win32 dll encapsulated inside a Unix -library. -.PP -.B winebuild -has different modes, depending on what kind of file it is asked to -generate. The mode is specified by one of the mode options specified -below. In addition to the mode option, various other command-line -option can be specified, as described in the \fBOPTIONS\fR section. -.SH "MODE OPTIONS" -You have to specify exactly one of the following options, depending on -what you want winebuild to generate. -.TP -.BI \--dll= filename -Build a C file from a .spec file (see \fBSPEC FILE SYNTAX\fR for -details), or from a standard Windows .def file. The resulting C file -must be compiled and linked to the other object files to build a -working Wine dll. -.br -In that mode, the -.I input files -should be the list of all object files that will be linked into the -final dll, to allow -.B winebuild -to get the list of all undefined symbols that need to be imported from -other dlls. -.TP -.BI \--exe= name -Build a C file for the named executable. This is basically the same as -the --dll mode except that it doesn't require a .spec file as input, -since an executable doesn't export functions. The resulting C file -must be compiled and linked to the other object files to build a -working Wine executable, and all the other object files must be listed -as -.I input files. -.TP -.BI \--def= file.spec -Build a .def file from a spec file. This is used when building dlls -with a PE (Win32) compiler. -.TP -.B \--debug -Build a C file containing the definitions for debugging channels. In -that mode the -.I input files -should be a list of C files to search for debug channel -definitions. The resulting C file must be compiled and linked with the -dll. -.TP -.B \--relay16 -Generate the assembly code for the 16-bit relay routines. This is for -Wine internal usage only, you should never need to use this option. -.TP -.B \--relay32 -Generate the assembly code for the 32-bit relay routines. This is for -Wine internal usage only, you should never need to use this option. -.SH OPTIONS -.TP -.BI \-C,\ --source-dir= directory -Change to the specified directory before reading source files. Only -meaningful in -.BR \--debug\ mode. -.TP -.BI \-D\ symbol -Ignored for compatibility with the C compiler. -.TP -.BI \-e,\ --entry= function -Specify the module entry point function; if not specified, the default -is -.B DllMain -for dlls, and -.B WinMain -for executables (if -.B WinMain -is not defined, the standard C -.B main -is used instead). This is only valid for Win32 modules. -.TP -.BI \-f\ flags -Ignored for compatibility with the C compiler. -.TP -.BI \-F,\ --filename= filename -Set the file name of the module. The default is to use the base name -of the spec file (without any extension). -.TP -.B \-h, --help -Display a usage message and exit. -.TP -.BI \-H,\ --heap= size -Specify the size of the module local heap in bytes (only valid for -Win16 modules); default is no local heap. -.TP -.BI \-i,\ --ignore= [-]symbol[,[-]symbol] -Specify a list of symbols that should be ignored when resolving -undefined symbols against the imported libraries. This forces these -symbols to be resolved from the Unix C library (or from another Unix -library linked with the application). If a symbol is prefixed by '-' -it is removed from the list instead of being added; a stand-alone '-' -clears the whole list. -.TP -.BI \-I\ directory -Ignored for compatibility with the C compiler. -.TP -.B \-k, --kill-at -Remove the stdcall decorations from the symbol names in the -generated .def file. Only meaningful in \fB--def\fR mode. -.TP -.BI \-K\ flags -Ignored for compatibility with the C compiler. -.TP -.BI \--ld-cmd= ld-command -Specify the command to use to link the object files; the default is -\fBld\fR. -.TP -.BI \--nm-cmd= nm-command -Specify the command to use to get the list of undefined symbols; the -default is \fBnm\fR. -.TP -.BI \-L,\ --library-path= directory -Append the specified directory to the list of directories that are -searched for import libraries. -.TP -.BI \-l,\ --library= name -Import the specified library, looking for a corresponding -\fIlibname.def\fR file in the directories specified with the \fB-L\fR -option. -.TP -.BI \-d,\ --delay-lib= name -Same as the \fB-l\fR option, but import the specified library in -delayed mode (i.e. the library won't be loaded until a function -imported from it is actually called). -.TP -.BI \-M,\ --main-module= module -Specify that we are building a 16-bit dll, that will ultimately be -linked together with the 32-bit dll specified in \fImodule\fR. Only -meaningful in \fB--dll\fR mode. -.TP -.BI \-N,\ --dll-name= dllname -Set the internal name of the module. It is only used in Win16 -modules. The default is to use the base name of the spec file (without -any extension). This is used for KERNEL, since it lives in -KRNL386.EXE. It shouldn't be needed otherwise. -.TP -.BI \-o,\ --output= file -Set the name of the output file (default is standard output). -.TP -.BI \-r,\ --res= rsrc.res -Load resources from the specified binary resource file. The -\fIrsrc.res\fR can be produced from a source resource file with -.BR wrc(1) -(or with a Windows resource compiler). -.br -This option is only necessary for Win16 resource files, the Win32 ones -can simply listed as -.I input files -and will automatically be handled correctly (though the -.B \-r -option will also work for Win32 files). -.TP -.BI --subsystem= subsystem[:major[.minor]] -Set the subsystem of the executable, which can be one of the following: -.br -.B console -for a command line executable, -.br -.B windows -for a graphical executable, -.br -.B native -for a native-mode dll. -.br -The entry point of a command line executable is a normal C \fBmain\fR -function. A \fBwmain\fR function can be used instead if you need the -argument array to use Unicode strings. A graphical executable has a -\fBWinMain\fR entry point. -.br -Optionally a major and minor subsystem version can also be specified; -the default subsystem version is 4.0. -.TP -.B \--version -Display the program version and exit. -.TP -.B \-w, --warnings -Turn on warnings. -.SH "SPEC FILE SYNTAX" -.SS "General syntax" -A spec file should contain a list of ordinal declarations. The general -syntax is the following: -.PP -.I ordinal functype -.RI [ flags ]\ exportname \ \fB(\fR\ [ args... ] \ \fB) \ [ handler ] -.br -.IB ordinal\ variable -.RI [ flags ]\ exportname \ \fB(\fR\ [ data... ] \ \fB) -.br -.IB ordinal\ extern -.RI [ flags ]\ exportname \ [ symbolname ] -.br -.IB ordinal\ stub -.RI [ flags ]\ exportname -.br -.IB ordinal\ equate -.RI [ flags ]\ exportname\ data -.br -.BI #\ comments -.PP -Declarations must fit on a single line, except if the end of line is -escaped using a backslash character. The -.B # -character anywhere in a line causes the rest of the line to be ignored -as a comment. -.PP -.I ordinal -specifies the ordinal number corresponding to the entry point, or '@' -for automatic ordinal allocation (Win32 only). -.PP -.I flags -is a series of optional flags, preceded by a '-' character. The -supported flags are: -.RS -.TP -.B -norelay -The entry point is not displayed in relay debugging traces (Win32 -only). -.TP -.B -noname -The entry point will be imported by ordinal instead of by name. -.TP -.B -ret16 -The function returns a 16-bit value (Win16 only). -.TP -.B -ret64 -The function returns a 64-bit value (Win32 only). -.TP -.B -i386 -The entry point is only available on i386 platforms. -.TP -.B -register -The function uses CPU register to pass arguments. -.TP -.B -private -The function cannot be imported from other dlls, it can only be -accessed through GetProcAddress. -.SS "Function ordinals" -Syntax: -.br -.I ordinal functype -.RI [ flags ]\ exportname \ \fB(\fR\ [ args... ] \ \fB) \ [ handler ] -.br - -This declaration defines a function entry point. The prototype defined by -.IR exportname \ \fB(\fR\ [ args... ] \ \fB) -specifies the name available for dynamic linking and the format of the -arguments. '@' can be used instead of -.I exportname -for ordinal-only exports. -.PP -.I functype -should be one of: -.RS -.TP -.B stdcall -for a normal Win32 function -.TP -.B pascal -for a normal Win16 function -.TP -.B cdecl -for a Win16 or Win32 function using the C calling convention -.TP -.B varargs -for a Win16 or Win32 function using the C calling convention with a -variable number of arguments -.RE -.PP -.I args -should be one or several of: -.RS -.TP -.B word -(16-bit unsigned value) -.TP -.B s_word -(16-bit signed word) -.TP -.B long -(32-bit value) -.TP -.B double -(64-bit value) -.TP -.B ptr -(linear pointer) -.TP -.B str -(linear pointer to a null-terminated ASCII string) -.TP -.B wstr -(linear pointer to a null-terminated Unicode string) -.TP -.B segptr -(segmented pointer) -.TP -.B segstr -(segmented pointer to a null-terminated ASCII string). -.HP -.RB Only\ ptr ,\ str ,\ wstr ,\ long\ and\ double -are valid for Win32 functions. -.RE -.PP -.I handler -is the name of the actual C function that will implement that entry -point in 32-bit mode. The handler can also be specified as -.IB dllname . function -to define a forwarded function (one whose implementation is in another -dll). If -.I handler -is not specified, it is assumed to be identical to -.I exportname. -.PP -This first example defines an entry point for the 32-bit GetFocus() -call: -.IP -@ stdcall GetFocus() GetFocus -.PP -This second example defines an entry point for the 16-bit -CreateWindow() call (the ordinal 100 is just an example); it also -shows how long lines can be split using a backslash: -.IP -100 pascal CreateWindow(ptr ptr long s_word s_word s_word \\ - s_word word word word ptr) WIN_CreateWindow -.PP -To declare a function using a variable number of arguments, specify -the function as -.B varargs -and declare it in the C file with a '...' parameter for a Win32 -function, or with an extra VA_LIST16 argument for a Win16 function. -See the wsprintf* functions in user.exe.spec and user32.spec for an -example. -.SS "Variable ordinals" -Syntax: -.br -.IB ordinal\ variable -.RI [ flags ]\ exportname \ \fB(\fR\ [ data... ] \ \fB) -.PP -This declaration defines data storage as 32-bit words at the ordinal -specified. -.I exportname -will be the name available for dynamic -linking. -.I data -can be a decimal number or a hex number preceeded by "0x". The -following example defines the variable VariableA at ordinal 2 and -containing 4 ints: -.IP -2 variable VariableA(-1 0xff 0 0) -.PP -This declaration only works in Win16 spec files. In Win32 you should -use -.B extern -instead (see below). -.SS "Extern ordinals" -Syntax: -.br -.IB ordinal\ extern -.RI [ flags ]\ exportname \ [ symbolname ] -.PP -This declaration defines an entry that simply maps to a C symbol -(variable or function). It only works in Win32 spec files. -.I exportname -will point to the symbol -.I symbolname -that must be defined in the C code. Alternatively, it can be of the -form -.IB dllname . symbolname -to define a forwarded symbol (one whose implementation is in another -dll). If -.I symbolname -is not specified, it is assumed to be identical to -.I exportname. -.SS "Stub ordinals" -Syntax: -.br -.IB ordinal\ stub -.RI [ flags ]\ exportname -.PP -This declaration defines a stub function. It makes the name and -ordinal available for dynamic linking, but will terminate execution -with an error message if the function is ever called. -.SS "Equate ordinals" -Syntax: -.br -.IB ordinal\ equate -.RI [ flags ]\ exportname\ data -.PP -This declaration defines an ordinal as an absolute value. -.I exportname -will be the name available for dynamic linking. -.I data -can be a decimal number or a hex number preceeded by "0x". -.SH AUTHORS -.B winebuild -has been worked on by many people over the years. The main authors are -Robert J. Amstadt, Alexandre Julliard, Martin von Loewis, Ulrich -Weigand and Eric Youngdale. Many other Wine developers have -contributed, please check the file Changelog in the Wine distribution -for the complete details. -.SH BUGS -It is not yet possible to use a PE-format dll in an import -specification; only Wine dlls can be imported. -.PP -If you find a bug, please submit a bug report at -.UR http://bugs.winehq.org -.B http://bugs.winehq.org. -.UE -.SH AVAILABILITY -.B winebuild -is part of the wine distribution, which is available through WineHQ, -the -.B wine -development headquarters, at -.UR http://www.winehq.org/ -.B http://www.winehq.org/. -.UE -.SH "SEE ALSO" -.BR wine (1), -.BR wrc (1).

19 years, 6 months

[gvg] 14051: Wine-20050310 vendor drop

by gvg＠svn.reactos.com

Wine-20050310 vendor drop Modified: vendor/wine/dlls/comctl32/current/comctl32.spec Modified: vendor/wine/dlls/comctl32/current/comctl_Es.rc Modified: vendor/wine/dlls/comctl32/current/draglist.c Modified: vendor/wine/dlls/comctl32/current/header.c Modified: vendor/wine/dlls/comctl32/current/imagelist.c Modified: vendor/wine/dlls/comctl32/current/listview.c Modified: vendor/wine/dlls/comctl32/current/rebar.c Modified: vendor/wine/dlls/comctl32/current/status.c Modified: vendor/wine/dlls/comctl32/current/string.c Modified: vendor/wine/dlls/comctl32/current/syslink.c Modified: vendor/wine/dlls/comctl32/current/tab.c Modified: vendor/wine/dlls/comctl32/current/treeview.c Modified: vendor/wine/dlls/commdlg/current/cdlg32.c Modified: vendor/wine/dlls/commdlg/current/cdlg_En.rc Modified: vendor/wine/dlls/commdlg/current/cdlg_Es.rc Modified: vendor/wine/dlls/commdlg/current/cdlg_Pt.rc Modified: vendor/wine/dlls/commdlg/current/cdlg_xx.rc Modified: vendor/wine/dlls/commdlg/current/colordlg.c Modified: vendor/wine/dlls/commdlg/current/colordlg16.c Modified: vendor/wine/dlls/commdlg/current/filedlg.c Modified: vendor/wine/dlls/commdlg/current/finddlg.c Modified: vendor/wine/dlls/commdlg/current/fontdlg.c Modified: vendor/wine/dlls/commdlg/current/fontdlg16.c Modified: vendor/wine/dlls/dinput/current/joystick_linuxinput.c Modified: vendor/wine/dlls/dinput/current/keyboard.c Modified: vendor/wine/dlls/dinput/current/mouse.c Modified: vendor/wine/dlls/dsound/current/buffer.c Modified: vendor/wine/dlls/dsound/current/capture.c Modified: vendor/wine/dlls/dsound/current/dsound.c Modified: vendor/wine/dlls/dsound/current/dsound_main.c Modified: vendor/wine/dlls/dsound/current/dsound_private.h Modified: vendor/wine/dlls/dsound/current/mixer.c Modified: vendor/wine/dlls/dsound/current/primary.c Modified: vendor/wine/dlls/dsound/current/propset.c Modified: vendor/wine/dlls/dsound/current/regsvr.c Modified: vendor/wine/dlls/dsound/current/sound3d.c Modified: vendor/wine/dlls/mpr/current/mpr_De.rc Modified: vendor/wine/dlls/mpr/current/mpr_En.rc Modified: vendor/wine/dlls/mpr/current/mpr_Es.rc Modified: vendor/wine/dlls/mpr/current/mpr_Fr.rc Modified: vendor/wine/dlls/mpr/current/mpr_Pt.rc Modified: vendor/wine/dlls/msi/current/Makefile.in Modified: vendor/wine/dlls/msi/current/action.c Modified: vendor/wine/dlls/msi/current/action.h Modified: vendor/wine/dlls/msi/current/appsearch.c Added: vendor/wine/dlls/msi/current/delete.c Modified: vendor/wine/dlls/msi/current/dialog.c Modified: vendor/wine/dlls/msi/current/format.c Modified: vendor/wine/dlls/msi/current/msi.c Modified: vendor/wine/dlls/msi/current/msi.rc Modified: vendor/wine/dlls/msi/current/msi.spec Added: vendor/wine/dlls/msi/current/msi_De.rc Added: vendor/wine/dlls/msi/current/msi_Es.rc Added: vendor/wine/dlls/msi/current/msi_Fr.rc Added: vendor/wine/dlls/msi/current/msi_Pt.rc Modified: vendor/wine/dlls/msi/current/msipriv.h Modified: vendor/wine/dlls/msi/current/msiquery.c Modified: vendor/wine/dlls/msi/current/package.c Modified: vendor/wine/dlls/msi/current/preview.c Modified: vendor/wine/dlls/msi/current/query.h Modified: vendor/wine/dlls/msi/current/record.c Modified: vendor/wine/dlls/msi/current/registry.c Modified: vendor/wine/dlls/msi/current/sql.y Modified: vendor/wine/dlls/msi/current/suminfo.c Modified: vendor/wine/dlls/msi/current/table.c Modified: vendor/wine/dlls/msi/current/where.c Modified: vendor/wine/dlls/ole32/current/Makefile.in Modified: vendor/wine/dlls/ole32/current/clipboard.c Modified: vendor/wine/dlls/ole32/current/compobj.c Modified: vendor/wine/dlls/ole32/current/compobj_private.h Modified: vendor/wine/dlls/ole32/current/errorinfo.c Modified: vendor/wine/dlls/ole32/current/filemoniker.c Modified: vendor/wine/dlls/ole32/current/git.c Modified: vendor/wine/dlls/ole32/current/itemmoniker.c Modified: vendor/wine/dlls/ole32/current/marshal.c Modified: vendor/wine/dlls/ole32/current/ole2.c Modified: vendor/wine/dlls/ole32/current/ole32.spec Modified: vendor/wine/dlls/ole32/current/oleproxy.c Modified: vendor/wine/dlls/ole32/current/rpc.c Modified: vendor/wine/dlls/ole32/current/stg_bigblockfile.c Added: vendor/wine/dlls/ole32/current/stg_prop.c Modified: vendor/wine/dlls/ole32/current/stg_stream.c Modified: vendor/wine/dlls/ole32/current/storage32.c Modified: vendor/wine/dlls/ole32/current/storage32.h Modified: vendor/wine/dlls/ole32/current/stubmanager.c Modified: vendor/wine/dlls/oleaut32/current/Makefile.in Modified: vendor/wine/dlls/oleaut32/current/oleaut.c Modified: vendor/wine/dlls/oleaut32/current/oleaut32.rc Modified: vendor/wine/dlls/oleaut32/current/oleaut32.spec Modified: vendor/wine/dlls/oleaut32/current/oleaut32_Es.rc Modified: vendor/wine/dlls/oleaut32/current/olefont.c Modified: vendor/wine/dlls/oleaut32/current/olepicture.c Added: vendor/wine/dlls/oleaut32/current/recinfo.c Modified: vendor/wine/dlls/oleaut32/current/typelib.c Modified: vendor/wine/dlls/oleaut32/current/typelib2.c Modified: vendor/wine/dlls/oleaut32/current/usrmarshal.c Modified: vendor/wine/dlls/oleaut32/current/varformat.c Modified: vendor/wine/dlls/oleaut32/current/variant.c Modified: vendor/wine/dlls/oledlg/current/oledlg_Es.rc Modified: vendor/wine/dlls/richedit/current/Makefile.in [truncated at 100 lines; 74 more skipped] _____ Modified: vendor/wine/dlls/comctl32/current/comctl32.spec --- vendor/wine/dlls/comctl32/current/comctl32.spec 2005-03-14 07:21:20 UTC (rev 14050) +++ vendor/wine/dlls/comctl32/current/comctl32.spec 2005-03-14 10:12:00 UTC (rev 14051) @@ -101,10 +101,10 @@ 402 stdcall -noname FindMRUStringW(long wstr ptr) 403 stdcall -noname EnumMRUListW(long long ptr long) 404 stdcall -noname CreateMRUListLazyW(ptr long long long) -410 stdcall SetWindowSubclass(long ptr long long) -411 stdcall GetWindowSubclass(long ptr long ptr) -412 stdcall RemoveWindowSubclass(long ptr long) -413 stdcall DefSubclassProc(long long long long) +410 stdcall -noname SetWindowSubclass(long ptr long long) +411 stdcall -noname GetWindowSubclass(long ptr long ptr) +412 stdcall -noname RemoveWindowSubclass(long ptr long) +413 stdcall -noname DefSubclassProc(long long long long) 414 stdcall -noname MirrorIcon(ptr ptr) 415 stdcall -noname DrawTextWrap(long wstr long ptr long) user32.DrawTextW 416 stdcall -noname DrawTextExPrivWrap(long wstr long ptr long ptr) user32.DrawTextExW _____ Modified: vendor/wine/dlls/comctl32/current/comctl_Es.rc --- vendor/wine/dlls/comctl32/current/comctl_Es.rc 2005-03-14 07:21:20 UTC (rev 14050) +++ vendor/wine/dlls/comctl32/current/comctl_Es.rc 2005-03-14 10:12:00 UTC (rev 14051) @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE _____ Modified: vendor/wine/dlls/comctl32/current/draglist.c --- vendor/wine/dlls/comctl32/current/draglist.c 2005-03-14 07:21:20 UTC (rev 14050) +++ vendor/wine/dlls/comctl32/current/draglist.c 2005-03-14 10:12:00 UTC (rev 14051) @@ -42,10 +42,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(commctrl); -/* for compiler compatibility we only accept literal ASCII strings */ -#undef TEXT -#define TEXT(string) string - #define DRAGLIST_SUBCLASSID 0 #define DRAGLIST_SCROLLPERIOD 200 #define DRAGLIST_TIMERID 666 @@ -95,7 +91,7 @@ } /* cleans up after dragging */ -static inline void DragList_EndDrag(HWND hwnd, DRAGLISTDATA * data) +static void DragList_EndDrag(HWND hwnd, DRAGLISTDATA * data) { KillTimer(hwnd, DRAGLIST_TIMERID); ReleaseCapture(); @@ -207,12 +203,12 @@ */ BOOL WINAPI MakeDragList (HWND hwndLB) { - DRAGLISTDATA * data = Alloc(sizeof(DRAGLISTDATA)); + DRAGLISTDATA *data = Alloc(sizeof(DRAGLISTDATA)); TRACE("(%p)\n", hwndLB); if (!uDragListMessage) - uDragListMessage = RegisterWindowMessageA(DRAGLISTMSGSTRING); + uDragListMessage = RegisterWindowMessageW(DRAGLISTMSGSTRINGW); return SetWindowSubclass(hwndLB, DragList_SubclassWindowProc, DRAGLIST_SUBCLASSID, (DWORD_PTR)data); } @@ -301,14 +297,14 @@ ScreenToClient (hwndLB, &pt); GetClientRect (hwndLB, &rcClient); - nIndex = (INT)SendMessageA (hwndLB, LB_GETTOPINDEX, 0, 0); + nIndex = (INT)SendMessageW (hwndLB, LB_GETTOPINDEX, 0, 0); if (PtInRect (&rcClient, pt)) { /* point is inside -- get the item index */ while (TRUE) { - if (SendMessageA (hwndLB, LB_GETITEMRECT, nIndex, (LPARAM)&rcClient) == LB_ERR) + if (SendMessageW (hwndLB, LB_GETITEMRECT, nIndex, (LPARAM)&rcClient) == LB_ERR) return -1; if (PtInRect (&rcClient, pt)) @@ -338,7 +334,7 @@ dwLastScrollTime = dwScrollTime; - SendMessageA (hwndLB, LB_SETTOPINDEX, (WPARAM)nIndex, 0); + SendMessageW (hwndLB, LB_SETTOPINDEX, (WPARAM)nIndex, 0); } return -1; _____ Modified: vendor/wine/dlls/comctl32/current/header.c --- vendor/wine/dlls/comctl32/current/header.c 2005-03-14 07:21:20 UTC (rev 14050) +++ vendor/wine/dlls/comctl32/current/header.c 2005-03-14 10:12:00 UTC (rev 14051) @@ -324,9 +324,19 @@ } else tx = 0; - ImageList_DrawEx(infoPtr->himl, phdi->iImage, hdc, r.left + tx + 2*infoPtr->iMargin, - r.top + (r.bottom-r.top-infoPtr->himl->cy)/2, infoPtr->himl->cx, r.bottom-r.top, - CLR_DEFAULT, CLR_DEFAULT, 0); + + if (tx < (r.right-r.left - infoPtr->himl->cx - GetSystemMetrics(SM_CXEDGE))) + ImageList_DrawEx(infoPtr->himl, phdi->iImage, hdc, r.left + tx + 2*infoPtr->iMargin, + r.top + (r.bottom-r.top-infoPtr->himl->cy)/2, infoPtr->himl->cx, r.bottom-r.top, + CLR_DEFAULT, CLR_DEFAULT, 0); + else { + INT x = max(r.right - infoPtr->iMargin - infoPtr->himl->cx, r.left); + INT cx = min(infoPtr->himl->cx, r.right-r.left - GetSystemMetrics(SM_CXEDGE)); + ImageList_DrawEx(infoPtr->himl, phdi->iImage, hdc, x , + r.top + (r.bottom-r.top-infoPtr->himl->cy)/2, cx, r.bottom-r.top, + CLR_DEFAULT, CLR_DEFAULT, 0); + r.right -= infoPtr->himl->cx - infoPtr->iMargin; + } } if (((phdi->fmt & HDF_STRING) @@ -1203,10 +1213,8 @@ { lpItem->iOrder = phdi->iOrder; } - else - lpItem->iOrder = nItem; - HEADER_SendHeaderNotify (hwnd, HDN_ITEMCHANGEDA, nItem, phdi->mask); + HEADER_SendHeaderNotify (hwnd, HDN_ITEMCHANGEDA, nItem, phdi->mask); HEADER_SetItemBounds (hwnd); @@ -1270,10 +1278,8 @@ { lpItem->iOrder = phdi->iOrder; } - else - lpItem->iOrder = nItem; - HEADER_SendHeaderNotify(hwnd, HDN_ITEMCHANGEDW, nItem, phdi->mask); + HEADER_SendHeaderNotify(hwnd, HDN_ITEMCHANGEDW, nItem, phdi->mask); HEADER_SetItemBounds (hwnd); _____ Modified: vendor/wine/dlls/comctl32/current/imagelist.c --- vendor/wine/dlls/comctl32/current/imagelist.c 2005-03-14 07:21:20 UTC (rev 14050) +++ vendor/wine/dlls/comctl32/current/imagelist.c 2005-03-14 10:12:00 UTC (rev 14051) @@ -1577,84 +1577,28 @@ * * Creates an image list from a bitmap, icon or cursor. * - * PARAMS - * hi [I] instance handle - * lpbmp [I] name or id of the image - * cx [I] width of each image - * cGrow [I] number of images to expand - * clrMask [I] mask color - * uType [I] type of image to load - * uFlags [I] loading flags - * - * RETURNS - * Success: handle to the loaded image list - * Failure: NULL - * * SEE - * LoadImage () + * ImageList_LoadImageW () */ HIMAGELIST WINAPI ImageList_LoadImageA (HINSTANCE hi, LPCSTR lpbmp, INT cx, INT cGrow, COLORREF clrMask, UINT uType, UINT uFlags) { - HIMAGELIST himl = NULL; - HANDLE handle; - INT nImageCount; + HIMAGELIST himl; + LPWSTR lpbmpW; + DWORD len; - handle = LoadImageA (hi, lpbmp, uType, 0, 0, uFlags); - if (!handle) { - ERR("Error loading image!\n"); - return NULL; - } + if (!HIWORD(lpbmp)) + return ImageList_LoadImageW(hi, (LPCWSTR)lpbmp, cx, cGrow, clrMask, + uType, uFlags); - if (uType == IMAGE_BITMAP) { - BITMAP bmp; - GetObjectA (handle, sizeof(BITMAP), &bmp); + len = MultiByteToWideChar(CP_ACP, 0, lpbmp, -1, NULL, 0); + lpbmpW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, lpbmp, -1, lpbmpW, len); - /* To match windows behavior, if cx is set to zero and - the flag DI_DEFAULTSIZE is specified, cx becomes the - system metric value for icons. If the flag is not specified - the function sets the size to the height of the bitmap */ - if (cx == 0) - { - if (uFlags & DI_DEFAULTSIZE) - cx = GetSystemMetrics (SM_CXICON); - else - cx = bmp.bmHeight; - } - - nImageCount = bmp.bmWidth / cx; - - himl = ImageList_Create (cx, bmp.bmHeight, ILC_MASK | ILC_COLOR, - nImageCount, cGrow); - if (!himl) { - DeleteObject (handle); - return NULL; - } - ImageList_AddMasked (himl, (HBITMAP)handle, clrMask); - } - else if ((uType == IMAGE_ICON) || (uType == IMAGE_CURSOR)) { - ICONINFO ii; - BITMAP bmp; - - GetIconInfo (handle, &ii); - GetObjectA (ii.hbmColor, sizeof(BITMAP), (LPVOID)&bmp); - himl = ImageList_Create (bmp.bmWidth, bmp.bmHeight, - ILC_MASK | ILC_COLOR, 1, cGrow); - if (!himl) { - DeleteObject (ii.hbmColor); - DeleteObject (ii.hbmMask); - DeleteObject (handle); - return NULL; - } - ImageList_Add (himl, ii.hbmColor, ii.hbmMask); - DeleteObject (ii.hbmColor); - DeleteObject (ii.hbmMask); - } - - DeleteObject (handle); - + himl = ImageList_LoadImageW(hi, lpbmpW, cx, cGrow, clrMask, uType, uFlags); + HeapFree(GetProcessHeap(), 0, lpbmpW); return himl; } @@ -1683,7 +1627,7 @@ HIMAGELIST WINAPI ImageList_LoadImageW (HINSTANCE hi, LPCWSTR lpbmp, INT cx, INT cGrow, - COLORREF clrMask, UINT uType, UINT uFlags) + COLORREF clrMask, UINT uType, UINT uFlags) { HIMAGELIST himl = NULL; HANDLE handle; @@ -1726,7 +1670,7 @@ BITMAP bmp; GetIconInfo (handle, &ii); - GetObjectW (ii.hbmMask, sizeof(BITMAP), (LPVOID)&bmp); + GetObjectW (ii.hbmColor, sizeof(BITMAP), (LPVOID)&bmp); himl = ImageList_Create (bmp.bmWidth, bmp.bmHeight, ILC_MASK | ILC_COLOR, 1, cGrow); if (!himl) { _____ Modified: vendor/wine/dlls/comctl32/current/listview.c --- vendor/wine/dlls/comctl32/current/listview.c 2005-03-14 07:21:20 UTC (rev 14050) +++ vendor/wine/dlls/comctl32/current/listview.c 2005-03-14 10:12:00 UTC (rev 14051) @@ -6274,7 +6274,7 @@ if (infoPtr->clrBk != CLR_NONE) DeleteObject(infoPtr->hBkBrush); infoPtr->clrBk = clrBk; if (clrBk == CLR_NONE) - infoPtr->hBkBrush = (HBRUSH)GetClassLongW(infoPtr->hwndSelf, GCL_HBRBACKGROUND); + infoPtr->hBkBrush = (HBRUSH)GetClassLongPtrW(infoPtr->hwndSelf, GCLP_HBRBACKGROUND); else infoPtr->hBkBrush = CreateSolidBrush(clrBk); LISTVIEW_InvalidateList(infoPtr); @@ -8249,6 +8249,7 @@ lpColumnInfo->rcHeader.right += dx; LISTVIEW_ScrollColumns(infoPtr, lpnmh->iItem + 1, dx); + LISTVIEW_UpdateItemSize(infoPtr); if (uView == LVS_REPORT && is_redrawing(infoPtr)) { /* this trick works for left aligned columns only */ _____ Modified: vendor/wine/dlls/comctl32/current/rebar.c --- vendor/wine/dlls/comctl32/current/rebar.c 2005-03-14 07:21:20 UTC (rev 14050) +++ vendor/wine/dlls/comctl32/current/rebar.c 2005-03-14 10:12:00 UTC (rev 14051) @@ -134,7 +134,7 @@ SIZE offChild; /* x,y offset if child is not FIXEDSIZE */ UINT uMinHeight; - INT iRow; /* row this band assigned to */ + INT iRow; /* zero-based index of the row this band assigned to */ UINT fStatus; /* status flags, reset only by _Validate */ UINT fDraw; /* drawing flags, reset only by _Layout */ UINT uCDret; /* last return from NM_CUSTOMDRAW */ @@ -360,8 +360,14 @@ REBAR_DumpBandInfo( LPREBARBANDINFOA pB) { if( !TRACE_ON(rebar) ) return; - TRACE("band info: ID=%u, size=%u, child=%p, clrF=0x%06lx, clrB=0x%06lx\n", - pB->wID, pB->cbSize, pB->hwndChild, pB->clrFore, pB->clrBack); + TRACE("band info: "); + if (pB->fMask & RBBIM_ID); + TRACE("ID=%u, ", pB->wID); + TRACE("size=%u, child=%p", pB->cbSize, pB->hwndChild); + if (pB->fMask & RBBIM_COLORS) + TRACE(", clrF=0x%06lx, clrB=0x%06lx", pB->clrFore, pB->clrBack); + TRACE("\n"); + TRACE("band info: mask=0x%08x (%s)\n", pB->fMask, REBAR_FmtMask(pB->fMask)); if (pB->fMask & RBBIM_STYLE) TRACE("band info: style=0x%08x (%s)\n", pB->fStyle, REBAR_FmtStyle(pB->fStyle)); @@ -403,8 +409,14 @@ (iP->NtfUnicode)?"TRUE":"FALSE", (iP->DoRedraw)?"TRUE":"FALSE"); for (i = 0; i < iP->uNumBands; i++) { pB = &iP->bands[i]; - TRACE("band # %u: ID=%u, child=%p, row=%u, clrF=0x%06lx, clrB=0x%06lx\n", - i, pB->wID, pB->hwndChild, pB->iRow, pB->clrFore, pB->clrBack); + TRACE("band # %u:", i); + if (pB->fMask & RBBIM_ID); + TRACE(" ID=%u", pB->wID); + if (pB->fMask & RBBIM_CHILD) + TRACE(" child=%p", pB->hwndChild); + if (pB->fMask & RBBIM_COLORS) + TRACE(" clrF=0x%06lx clrB=0x%06lx", pB->clrFore, pB->clrBack); + TRACE("\n"); TRACE("band # %u: mask=0x%08x (%s)\n", i, pB->fMask, REBAR_FmtMask(pB->fMask)); if (pB->fMask & RBBIM_STYLE) TRACE("band # %u: style=0x%08x (%s)\n", @@ -1419,7 +1431,7 @@ clientcx, clientcy, adjcx, adjcy); x = initx; y = inity; - row = 1; + row = 0; cx = 0; mcy = 0; rowstart = 0; @@ -1560,7 +1572,7 @@ } if (infoPtr->uNumBands) - infoPtr->uNumRows = row; + infoPtr->uNumRows = row + 1; /* ******* End Phase 1 - all bands on row at minimum size ******* */ @@ -1583,7 +1595,7 @@ /* now adjust all rectangles by using the height found above */ xy = 0; - row = 1; + row = 0; for (i=0; i<infoPtr->uNumBands; i++) { lpBand = &infoPtr->bands[i]; if (HIDDENBAND(lpBand)) continue; @@ -1759,6 +1771,7 @@ if( !(lpBand->fDraw&DRAW_LAST_IN_ROW) ) continue; + /* FIXME: this next line is wrong, but fixing it to be inverted causes IE's sidebars to be the wrong size */ if (lpBand->fMask & RBBS_VARIABLEHEIGHT) continue; if (((INT)lpBand->cyMaxChild < 1) || ((INT)lpBand->cyIntegral < 1)) { @@ -1943,7 +1956,7 @@ infoPtr->fStatus |= BAND_NEEDS_LAYOUT; /* Header is where the image, text and gripper exist */ - /* in the band and preceed the child window. */ + /* in the band and precede the child window. */ /* count number of non-FIXEDSIZE and non-Hidden bands */ nonfixed = 0; _____ Modified: vendor/wine/dlls/comctl32/current/status.c --- vendor/wine/dlls/comctl32/current/status.c 2005-03-14 07:21:20 UTC (rev 14050) +++ vendor/wine/dlls/comctl32/current/status.c 2005-03-14 10:12:00 UTC (rev 14051) @@ -79,6 +79,9 @@ BOOL NtfUnicode; /* notify format */ STATUSWINDOWPART part0; /* simple window */ STATUSWINDOWPART* parts; + INT horizontalBorder; + INT verticalBorder; + INT horizontalGap; } STATUS_INFO; /* @@ -159,28 +162,24 @@ DrawEdge(hdc, &r, border, BF_RECT|BF_ADJUST); - if (part->style & SBT_OWNERDRAW) - { - DRAWITEMSTRUCT dis; + if (part->style & SBT_OWNERDRAW) { + DRAWITEMSTRUCT dis; - dis.CtlID = GetWindowLongPtrW (infoPtr->Self, GWLP_ID); - dis.itemID = itemID; - dis.hwndItem = infoPtr->Self; - dis.hDC = hdc; - dis.rcItem = r; - dis.itemData = (INT)part->text; - SendMessageW (infoPtr->Notify, WM_DRAWITEM, (WPARAM)dis.CtlID, (LPARAM)&dis); - } - else - { - if (part->hIcon) - { - INT cy = r.bottom - r.top; + dis.CtlID = GetWindowLongPtrW (infoPtr->Self, GWLP_ID); + dis.itemID = itemID; + dis.hwndItem = infoPtr->Self; + dis.hDC = hdc; + dis.rcItem = r; + dis.itemData = (INT)part->text; + SendMessageW (infoPtr->Notify, WM_DRAWITEM, (WPARAM)dis.CtlID, (LPARAM)&dis); + } else { + if (part->hIcon) { + INT cy = r.bottom - r.top; - r.left += 2; - DrawIconEx (hdc, r.left, r.top, part->hIcon, cy, cy, 0, 0, DI_NORMAL); - r.left += cy; - } + r.left += 2; + DrawIconEx (hdc, r.left, r.top, part->hIcon, cy, cy, 0, 0, DI_NORMAL); + r.left += cy; + } DrawStatusTextW (hdc, &r, part->text, SBT_NOBORDERS); } } @@ -213,12 +212,11 @@ if (infoPtr->clrBk != CLR_DEFAULT) DeleteObject (hbrBk); - if (GetWindowLongW (infoPtr->Self, GWL_STYLE) & SBARS_SIZEGRIP) - { - RECT rect; + if (GetWindowLongW (infoPtr->Self, GWL_STYLE) & SBARS_SIZEGRIP) { + RECT rect; - GetClientRect (infoPtr->Self, &rect); - STATUSBAR_DrawSizeGrip (hdc, &rect); + GetClientRect (infoPtr->Self, &rect); + STATUSBAR_DrawSizeGrip (hdc, &rect); } } @@ -240,19 +238,19 @@ GetClientRect (infoPtr->Self, &rect); if (infoPtr->clrBk != CLR_DEFAULT) - hbrBk = CreateSolidBrush (infoPtr->clrBk); + hbrBk = CreateSolidBrush (infoPtr->clrBk); else - hbrBk = GetSysColorBrush (COLOR_3DFACE); + hbrBk = GetSysColorBrush (COLOR_3DFACE); FillRect(hdc, &rect, hbrBk); hOldFont = SelectObject (hdc, infoPtr->hFont ? infoPtr->hFont : infoPtr->hDefaultFont); if (infoPtr->simple) { - STATUSBAR_RefreshPart (infoPtr, hdc, &infoPtr->part0, 0); + STATUSBAR_RefreshPart (infoPtr, hdc, &infoPtr->part0, 0); } else { - for (i = 0; i < infoPtr->numParts; i++) { - STATUSBAR_RefreshPart (infoPtr, hdc, &infoPtr->parts[i], i); - } + for (i = 0; i < infoPtr->numParts; i++) { + STATUSBAR_RefreshPart (infoPtr, hdc, &infoPtr->parts[i], i); + } } SelectObject (hdc, hOldFont); @@ -278,7 +276,8 @@ GetClientRect (infoPtr->Self, &rect); TRACE("client wnd size is %ld,%ld - %ld,%ld\n", rect.left, rect.top, rect.right, rect.bottom); - rect.top += VERT_BORDER; + rect.left += infoPtr->horizontalBorder; + rect.top += infoPtr->verticalBorder; /* set bounds for simple rectangle */ infoPtr->part0.bound = rect; @@ -292,7 +291,7 @@ if (i == 0) r->left = 0; else - r->left = infoPtr->parts[i-1].bound.right + HORZ_GAP; + r->left = infoPtr->parts[i-1].bound.right + infoPtr->horizontalGap; if (part->x == -1) r->right = rect.right; else @@ -331,17 +330,30 @@ static BOOL -STATUSBAR_GetBorders (INT out[]) +STATUSBAR_GetBorders (STATUS_INFO *infoPtr, INT out[]) { TRACE("\n"); - out[0] = HORZ_BORDER; /* horizontal border width */ - out[1] = VERT_BORDER; /* vertical border width */ - out[2] = HORZ_GAP; /* width of border between rectangles */ + out[0] = infoPtr->horizontalBorder; + out[1] = infoPtr->verticalBorder; + out[2] = infoPtr->horizontalGap; return TRUE; } +static BOOL +STATUSBAR_SetBorders (STATUS_INFO *infoPtr, INT in[]) +{ + TRACE("\n"); + infoPtr->horizontalBorder = in[0]; + infoPtr->verticalBorder = in[1]; + infoPtr->horizontalGap = in[2]; + InvalidateRect(infoPtr->Self, NULL, FALSE); + + return TRUE; +} + + static HICON STATUSBAR_GetIcon (STATUS_INFO *infoPtr, INT nPart) { @@ -560,13 +572,13 @@ RECT parent_rect; GetClientRect (infoPtr->Notify, &parent_rect); - infoPtr->height = height + VERT_BORDER; + infoPtr->height = height + infoPtr->verticalBorder; width = parent_rect.right - parent_rect.left; x = parent_rect.left; y = parent_rect.bottom - infoPtr->height; MoveWindow (infoPtr->Self, parent_rect.left, - parent_rect.bottom - infoPtr->height, - width, infoPtr->height, TRUE); + parent_rect.bottom - infoPtr->height, + width, infoPtr->height, TRUE); STATUSBAR_SetPartBounds (infoPtr); } @@ -728,8 +740,7 @@ ti.uId = id; ti.hinst = 0; ti.lpszText = text; - SendMessageA (infoPtr->hwndToolTip, TTM_UPDATETIPTEXTA, - 0, (LPARAM)&ti); + SendMessageA (infoPtr->hwndToolTip, TTM_UPDATETIPTEXTA, 0, (LPARAM)&ti); } return 0; @@ -747,8 +758,7 @@ ti.uId = id; ti.hinst = 0; ti.lpszText = text; - SendMessageW (infoPtr->hwndToolTip, TTM_UPDATETIPTEXTW, - 0, (LPARAM)&ti); + SendMessageW (infoPtr->hwndToolTip, TTM_UPDATETIPTEXTW, 0, (LPARAM)&ti); } return 0; @@ -838,6 +848,9 @@ infoPtr->simple = FALSE; infoPtr->clrBk = CLR_DEFAULT; infoPtr->hFont = 0; + infoPtr->horizontalBorder = HORZ_BORDER; + infoPtr->verticalBorder = VERT_BORDER; + infoPtr->horizontalGap = HORZ_GAP; i = SendMessageW(infoPtr->Notify, WM_NOTIFYFORMAT, (WPARAM)hwnd, NF_QUERY); infoPtr->NtfUnicode = (i == NFR_UNICODE); @@ -929,7 +942,7 @@ if (!(dwStyle & CCS_NORESIZE)) { /* don't resize wnd if it doesn't want it ! */ GetClientRect (infoPtr->Notify, &rect); width = rect.right - rect.left; - infoPtr->height = textHeight + 4 + VERT_BORDER; + infoPtr->height = textHeight + 4 + infoPtr->verticalBorder; SetWindowPos(hwnd, 0, lpCreate->x, lpCreate->y - 1, width, infoPtr->height, SWP_NOZORDER); STATUSBAR_SetPartBounds (infoPtr); @@ -1069,8 +1082,7 @@ /* Need to resize width to match parent */ TRACE("flags %04x\n", flags); - if (flags != SIZE_RESTORED && flags != SIZE_MAXIMIZED) - { + if (flags != SIZE_RESTORED && flags != SIZE_MAXIMIZED) { WARN("flags MUST be SIZE_RESTORED or SIZE_MAXIMIZED\n"); return FALSE; } @@ -1129,7 +1141,7 @@ switch (msg) { case SB_GETBORDERS: - return STATUSBAR_GetBorders ((INT *)lParam); + return STATUSBAR_GetBorders (infoPtr, (INT *)lParam); case SB_GETICON: return (LRESULT)STATUSBAR_GetIcon (infoPtr, nPart); @@ -1162,6 +1174,9 @@ case SB_ISSIMPLE: return infoPtr->simple; + case SB_SETBORDERS: + return STATUSBAR_SetBorders (infoPtr, (INT *)lParam); + case SB_SETBKCOLOR: return STATUSBAR_SetBkColor (infoPtr, (COLORREF)lParam); _____ Modified: vendor/wine/dlls/comctl32/current/string.c --- vendor/wine/dlls/comctl32/current/string.c 2005-03-14 07:21:20 UTC (rev 14050) +++ vendor/wine/dlls/comctl32/current/string.c 2005-03-14 10:12:00 UTC (rev 14051) @@ -421,7 +421,7 @@ /*********************************************************************** *** * StrRChrA [COMCTL32.351] * - * Find the last occurence of a character in string. + * Find the last occurrence of a character in string. * * PARAMS * lpszStr [I] String to search in @@ -572,7 +572,7 @@ /*********************************************************************** ** * StrRStrIA [COMCTL32.372] * - * Find the last occurence of a substring within a string. + * Find the last occurrence of a substring within a string. * * PARAMS * lpszStr [I] String to search in @@ -580,7 +580,7 @@ * lpszSearch [I] String to look for * * RETURNS - * The last occurence lpszSearch within lpszStr, or NULL if not found. + * The last occurrence lpszSearch within lpszStr, or NULL if not found. */ LPSTR WINAPI StrRStrIA(LPCSTR lpszStr, LPCSTR lpszEnd, LPCSTR lpszSearch) { @@ -709,7 +709,7 @@ /*********************************************************************** *** * StrRChrIA [COMCTL32.368] * - * Find the last occurence of a character in string, ignoring case. + * Find the last occurrence of a character in string, ignoring case. * * PARAMS * lpszStr [I] String to search in _____ Modified: vendor/wine/dlls/comctl32/current/syslink.c --- vendor/wine/dlls/comctl32/current/syslink.c 2005-03-14 07:21:20 UTC (rev 14050) +++ vendor/wine/dlls/comctl32/current/syslink.c 2005-03-14 10:12:00 UTC (rev 14051) @@ -513,7 +513,7 @@ /*********************************************************************** * SYSLINK_GetLinkItemByIndex - * Retreives a document link by it's index + * Retrieves a document link by its index */ static PDOC_ITEM SYSLINK_GetLinkItemByIndex (SYSLINK_INFO *infoPtr, int iLink) { @@ -532,7 +532,7 @@ /*********************************************************************** * SYSLINK_GetFocusLink - * Retreives the link that has the LIS_FOCUSED bit + * Retrieves the link that has the LIS_FOCUSED bit */ static PDOC_ITEM SYSLINK_GetFocusLink (SYSLINK_INFO *infoPtr, int *LinkId) { _____ Modified: vendor/wine/dlls/comctl32/current/tab.c --- vendor/wine/dlls/comctl32/current/tab.c 2005-03-14 07:21:20 UTC (rev 14050) +++ vendor/wine/dlls/comctl32/current/tab.c 2005-03-14 10:12:00 UTC (rev 14051) @@ -59,7 +59,7 @@ * leftmost item (the leftmost item, 0, would have a * "left" member of 0 in this rectangle) * - * additionally the top member hold the row number + * additionally the top member holds the row number * and bottom is unused and should be 0 */ BYTE extra[1]; /* Space for caller supplied info, variable size */ } TAB_ITEM; @@ -69,6 +69,7 @@ typedef struct { + HWND hwnd; /* Tab control window */ HWND hwndNotify; /* notification window (parent) */ UINT uNumItem; /* number of tab items */ UINT uNumRows; /* number of tab rows */ @@ -126,20 +127,17 @@ /*********************************************************************** ******* * Prototypes */ -static void TAB_Refresh (HWND hwnd, HDC hdc); -static void TAB_InvalidateTabArea(HWND hwnd, TAB_INFO* infoPtr); -static void TAB_EnsureSelectionVisible(HWND hwnd, TAB_INFO* infoPtr); -static void TAB_DrawItem(HWND hwnd, HDC hdc, INT iItem); -static void TAB_DrawItemInterior(HWND hwnd, HDC hdc, INT iItem, RECT* drawRect); +static void TAB_InvalidateTabArea(TAB_INFO *); +static void TAB_EnsureSelectionVisible(TAB_INFO *); +static void TAB_DrawItemInterior(TAB_INFO *, HDC, INT, RECT*); static BOOL -TAB_SendSimpleNotify (HWND hwnd, UINT code) +TAB_SendSimpleNotify (const TAB_INFO *infoPtr, UINT code) { - TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd); NMHDR nmhdr; - nmhdr.hwndFrom = hwnd; - nmhdr.idFrom = GetWindowLongPtrW(hwnd, GWLP_ID); + nmhdr.hwndFrom = infoPtr->hwnd; + nmhdr.idFrom = GetWindowLongPtrW(infoPtr->hwnd, GWLP_ID); nmhdr.code = code; return (BOOL) SendMessageW (infoPtr->hwndNotify, WM_NOTIFY, @@ -203,11 +201,8 @@ /* RETURNS * the index of the selected tab, or -1 if no tab is selected. */ -static LRESULT -TAB_GetCurSel (HWND hwnd) +static inline LRESULT TAB_GetCurSel (const TAB_INFO *infoPtr) { - TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd); - return infoPtr->iSelected; } @@ -217,10 +212,9 @@ * we have not to return negative value * TODO * test for windows */ -static LRESULT -TAB_GetCurFocus (HWND hwnd) +static inline LRESULT +TAB_GetCurFocus (const TAB_INFO *infoPtr) { - TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd); if (infoPtr->uFocus<0) { FIXME("we have not to return negative value"); @@ -229,79 +223,66 @@ return infoPtr->uFocus; } -static LRESULT -TAB_GetToolTips (HWND hwnd, WPARAM wParam, LPARAM lParam) +static inline LRESULT TAB_GetToolTips (const TAB_INFO *infoPtr) { - TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd); - if (infoPtr == NULL) return 0; return (LRESULT)infoPtr->hwndToolTip; } -static LRESULT -TAB_SetCurSel (HWND hwnd,WPARAM wParam) +static inline LRESULT TAB_SetCurSel (TAB_INFO *infoPtr, INT iItem) { - TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd); - INT iItem = (INT)wParam; - INT prevItem; + INT prevItem = -1; - prevItem = -1; - if ((iItem >= 0) && (iItem < infoPtr->uNumItem)) { - prevItem=infoPtr->iSelected; + if (iItem >= 0 && iItem < infoPtr->uNumItem) { + prevItem=infoPtr->iSelected; infoPtr->iSelected=iItem; - TAB_EnsureSelectionVisible(hwnd, infoPtr); - TAB_InvalidateTabArea(hwnd, infoPtr); + TAB_EnsureSelectionVisible(infoPtr); + TAB_InvalidateTabArea(infoPtr); } return prevItem; } -static LRESULT -TAB_SetCurFocus (HWND hwnd,WPARAM wParam) +static LRESULT TAB_SetCurFocus (TAB_INFO *infoPtr, INT iItem) { - TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd); - INT iItem=(INT) wParam; + if (iItem < 0 || iItem >= infoPtr->uNumItem) return 0; - if ((iItem < 0) || (iItem >= infoPtr->uNumItem)) return 0; - - if (GetWindowLongA(hwnd, GWL_STYLE) & TCS_BUTTONS) { + if (GetWindowLongA(infoPtr->hwnd, GWL_STYLE) & TCS_BUTTONS) { FIXME("Should set input focus\n"); } else { int oldFocus = infoPtr->uFocus; if (infoPtr->iSelected != iItem || oldFocus == -1 ) { infoPtr->uFocus = iItem; if (oldFocus != -1) { - if (!TAB_SendSimpleNotify(hwnd, TCN_SELCHANGING)) { + if (!TAB_SendSimpleNotify(infoPtr, TCN_SELCHANGING)) { infoPtr->iSelected = iItem; - TAB_SendSimpleNotify(hwnd, TCN_SELCHANGE); + TAB_SendSimpleNotify(infoPtr, TCN_SELCHANGE); } else infoPtr->iSelected = iItem; - TAB_EnsureSelectionVisible(hwnd, infoPtr); - TAB_InvalidateTabArea(hwnd, infoPtr); + TAB_EnsureSelectionVisible(infoPtr); + TAB_InvalidateTabArea(infoPtr); } } } return 0; } -static LRESULT -TAB_SetToolTips (HWND hwnd, WPARAM wParam, LPARAM lParam) +static inline LRESULT +TAB_SetToolTips (TAB_INFO *infoPtr, HWND hwndToolTip) { - TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd); - - if (infoPtr == NULL) return 0; - infoPtr->hwndToolTip = (HWND)wParam; + if (infoPtr) + infoPtr->hwndToolTip = hwndToolTip; return 0; } -static LRESULT -TAB_SetPadding (HWND hwnd, WPARAM wParam, LPARAM lParam) +static inline LRESULT +TAB_SetPadding (TAB_INFO *infoPtr, LPARAM lParam) { - TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd); - - if (infoPtr == NULL) return 0; - infoPtr->uHItemPadding_s=LOWORD(lParam); - infoPtr->uVItemPadding_s=HIWORD(lParam); + if (infoPtr) + { + infoPtr->uHItemPadding_s=LOWORD(lParam); + infoPtr->uVItemPadding_s=HIWORD(lParam); + } return 0; } @@ -315,14 +296,13 @@ * if it is completely outside the client area. */ static BOOL TAB_InternalGetItemRect( - HWND hwnd, - TAB_INFO* infoPtr, + const TAB_INFO* infoPtr, INT itemIndex, RECT* itemRect, RECT* selectedRect) { RECT tmpItemRect,clientRect; - LONG lStyle = GetWindowLongA(hwnd, GWL_STYLE); + LONG lStyle = GetWindowLongA(infoPtr->hwnd, GWL_STYLE); /* Perform a sanity check and a trivial visibility check. */ if ( (infoPtr->uNumItem <= 0) || @@ -341,7 +321,7 @@ *itemRect = TAB_GetItem(infoPtr,itemIndex)->rect; /* calculate the times bottom and top based on the row */ - GetClientRect(hwnd, &clientRect); + GetClientRect(infoPtr->hwnd, &clientRect); if ((lStyle & TCS_BOTTOM) && (lStyle & TCS_VERTICAL)) { @@ -440,10 +420,10 @@ return TRUE; } -static BOOL TAB_GetItemRect(HWND hwnd, WPARAM wParam, LPARAM lParam) +static inline BOOL +TAB_GetItemRect(TAB_INFO *infoPtr, WPARAM wParam, LPARAM lParam) { - return TAB_InternalGetItemRect(hwnd, TAB_GetInfoPtr(hwnd), (INT)wParam, - (LPRECT)lParam, (LPRECT)NULL); + return TAB_InternalGetItemRect(infoPtr, (INT)wParam, (LPRECT)lParam, (LPRECT)NULL); } /*********************************************************************** ******* @@ -451,11 +431,8 @@ * * This method is called to handle keyboard input */ -static LRESULT TAB_KeyUp( - HWND hwnd, - WPARAM keyCode) +static LRESULT TAB_KeyUp(TAB_INFO* infoPtr, WPARAM keyCode) { - TAB_INFO* infoPtr = TAB_GetInfoPtr(hwnd); int newItem = -1; switch (keyCode) @@ -471,18 +448,18 @@ /* * If we changed to a valid item, change the selection */ - if ((newItem >= 0) && - (newItem < infoPtr->uNumItem) && - (infoPtr->uFocus != newItem)) + if (newItem >= 0 && + newItem < infoPtr->uNumItem && + infoPtr->uFocus != newItem) { - if (!TAB_SendSimpleNotify(hwnd, TCN_SELCHANGING)) + if (!TAB_SendSimpleNotify(infoPtr, TCN_SELCHANGING)) { infoPtr->iSelected = newItem; infoPtr->uFocus = newItem; - TAB_SendSimpleNotify(hwnd, TCN_SELCHANGE); + TAB_SendSimpleNotify(infoPtr, TCN_SELCHANGE); - TAB_EnsureSelectionVisible(hwnd, infoPtr); - TAB_InvalidateTabArea(hwnd, infoPtr); + TAB_EnsureSelectionVisible(infoPtr); + TAB_InvalidateTabArea(infoPtr); } } @@ -495,21 +472,15 @@ * This method is called whenever the focus goes in or out of this control * it is used to update the visual state of the control. */ -static LRESULT TAB_FocusChanging( - HWND hwnd, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) +static VOID TAB_FocusChanging(const TAB_INFO *infoPtr) { - TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd); RECT selectedRect; BOOL isVisible; /* * Get the rectangle for the item. */ - isVisible = TAB_InternalGetItemRect(hwnd, - infoPtr, + isVisible = TAB_InternalGetItemRect(infoPtr, infoPtr->uFocus, NULL, &selectedRect); @@ -523,17 +494,11 @@ TRACE("invalidate (%ld,%ld)-(%ld,%ld)\n", selectedRect.left,selectedRect.top, selectedRect.right,selectedRect.bottom); - InvalidateRect(hwnd, &selectedRect, TRUE); + InvalidateRect(infoPtr->hwnd, &selectedRect, TRUE); } - - /* - * Don't otherwise disturb normal behavior. - */ - return DefWindowProcW (hwnd, uMsg, wParam, lParam); } static INT TAB_InternalHitTest ( - HWND hwnd, TAB_INFO* infoPtr, POINT pt, UINT* flags) @@ -544,7 +509,7 @@ for (iCount = 0; iCount < infoPtr->uNumItem; iCount++) { - TAB_InternalGetItemRect(hwnd, infoPtr, iCount, &rect, NULL); + TAB_InternalGetItemRect(infoPtr, iCount, &rect, NULL); if (PtInRect(&rect, pt)) { @@ -557,13 +522,10 @@ return -1; } -static LRESULT -TAB_HitTest (HWND hwnd, WPARAM wParam, LPARAM lParam) +static inline LRESULT +TAB_HitTest (TAB_INFO *infoPtr, LPTCHITTESTINFO lptest) [truncated at 1000 lines; 30757 more skipped]

19 years, 6 months

[jimtabor] 14050: Fixed up rc file names.

by jimtabor＠svn.reactos.com

Fixed up rc file names. Modified: trunk/reactos/subsys/system/sndvol32/sndvol32.rc _____ Modified: trunk/reactos/subsys/system/sndvol32/sndvol32.rc --- trunk/reactos/subsys/system/sndvol32/sndvol32.rc 2005-03-14 06:44:31 UTC (rev 14049) +++ trunk/reactos/subsys/system/sndvol32/sndvol32.rc 2005-03-14 07:21:20 UTC (rev 14050) @@ -15,4 +15,4 @@ IDI_MAINAPP ICON DISCARDABLE resources/sndvol32.ico #include "En.rc" -#include "DE.rc" +#include "De.rc"

19 years, 6 months

[ion] 14049: Support Priority Boosting during Wait Satisfaction and Thread Abortion, and use it where necessary. Should provide a bit more responsiveness.

by ion＠svn.reactos.com

Support Priority Boosting during Wait Satisfaction and Thread Abortion, and use it where necessary. Should provide a bit more responsiveness. Modified: trunk/reactos/ntoskrnl/include/internal/ke.h Modified: trunk/reactos/ntoskrnl/ke/apc.c Modified: trunk/reactos/ntoskrnl/ke/event.c Modified: trunk/reactos/ntoskrnl/ke/kthread.c Modified: trunk/reactos/ntoskrnl/ke/queue.c Modified: trunk/reactos/ntoskrnl/ke/sem.c Modified: trunk/reactos/ntoskrnl/ke/timer.c Modified: trunk/reactos/ntoskrnl/ke/wait.c Modified: trunk/reactos/ntoskrnl/ps/kill.c _____ Modified: trunk/reactos/ntoskrnl/include/internal/ke.h --- trunk/reactos/ntoskrnl/include/internal/ke.h 2005-03-14 05:54:58 UTC (rev 14048) +++ trunk/reactos/ntoskrnl/include/internal/ke.h 2005-03-14 06:44:31 UTC (rev 14049) @@ -160,7 +160,11 @@ VOID KeDumpStackFrames(PULONG Frame); BOOLEAN KiTestAlert(VOID); -VOID FASTCALL KiAbortWaitThread(struct _KTHREAD* Thread, NTSTATUS WaitStatus); +VOID +FASTCALL +KiAbortWaitThread(PKTHREAD Thread, + NTSTATUS WaitStatus, + KPRIORITY Increment); BOOLEAN STDCALL KiInsertTimer(PKTIMER Timer, LARGE_INTEGER DueTime); _____ Modified: trunk/reactos/ntoskrnl/ke/apc.c --- trunk/reactos/ntoskrnl/ke/apc.c 2005-03-14 05:54:58 UTC (rev 14048) +++ trunk/reactos/ntoskrnl/ke/apc.c 2005-03-14 06:44:31 UTC (rev 14049) @@ -276,7 +276,7 @@ (Apc->NormalRoutine == NULL)) { DPRINT("Waking up Thread for Kernel-Mode APC Delivery \n"); - KiAbortWaitThread(Thread, STATUS_KERNEL_APC); + KiAbortWaitThread(Thread, STATUS_KERNEL_APC, PriorityBoost); } } else if ((Thread->State == THREAD_STATE_BLOCKED) && @@ -285,7 +285,7 @@ DPRINT("Waking up Thread for User-Mode APC Delivery \n"); Thread->ApcState.UserApcPending = TRUE; - KiAbortWaitThread(Thread, STATUS_USER_APC); + KiAbortWaitThread(Thread, STATUS_USER_APC, PriorityBoost); } /* Return Sucess if we are here */ _____ Modified: trunk/reactos/ntoskrnl/ke/event.c --- trunk/reactos/ntoskrnl/ke/event.c 2005-03-14 05:54:58 UTC (rev 14048) +++ trunk/reactos/ntoskrnl/ke/event.c 2005-03-14 06:44:31 UTC (rev 14049) @@ -1,11 +1,12 @@ -/* $Id$ +/* * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/ke/event.c * PURPOSE: Implements events * - * PROGRAMMERS: David Welch (welch(a)mcmail.com) + * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) + * David Welch (welch(a)mcmail.com) */ /* INCLUDES *****************************************************************/ @@ -203,7 +204,7 @@ /* We can satisfy wait simply by waking the thread, since our signal state is 0 now */ DPRINT("WaitAny or Sync Event, just unwait the thread\n"); - KiAbortWaitThread(WaitBlock->Thread, WaitBlock->WaitKey); + KiAbortWaitThread(WaitBlock->Thread, WaitBlock->WaitKey, Increment); } } @@ -259,7 +260,7 @@ /* Reset the Quantum and Unwait the Thread */ WaitingThread->Quantum = WaitingThread->ApcState.Process->ThreadQuantum; - KiAbortWaitThread(WaitingThread, STATUS_SUCCESS); + KiAbortWaitThread(WaitingThread, STATUS_SUCCESS, EVENT_INCREMENT); } /* Release the Dispatcher Database Lock */ _____ Modified: trunk/reactos/ntoskrnl/ke/kthread.c --- trunk/reactos/ntoskrnl/ke/kthread.c 2005-03-14 05:54:58 UTC (rev 14048) +++ trunk/reactos/ntoskrnl/ke/kthread.c 2005-03-14 06:44:31 UTC (rev 14049) @@ -4,7 +4,7 @@ * FILE: ntoskrnl/ke/kthread.c * PURPOSE: Microkernel thread support * - * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) - Commented, reorganized some stuff, fixed/implemented some functions. + * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) * David Welch (welch(a)cwcom.net) */ @@ -14,6 +14,7 @@ #define NDEBUG #include <internal/debug.h> +#define THREAD_ALERT_INCREMENT 2 /* FUNCTIONS *****************************************************************/ ULONG @@ -36,7 +37,7 @@ if (Thread->State == THREAD_STATE_BLOCKED && Thread->Alertable) { DPRINT("Aborting Wait\n"); - KiAbortWaitThread(Thread, STATUS_ALERTED); + KiAbortWaitThread(Thread, STATUS_ALERTED, THREAD_ALERT_INCREMENT); } else { @@ -89,7 +90,7 @@ Thread->Alertable) { DPRINT("Aborting Wait\n"); - KiAbortWaitThread(Thread, STATUS_ALERTED); + KiAbortWaitThread(Thread, STATUS_ALERTED, THREAD_ALERT_INCREMENT); } else { _____ Modified: trunk/reactos/ntoskrnl/ke/queue.c --- trunk/reactos/ntoskrnl/ke/queue.c 2005-03-14 05:54:58 UTC (rev 14048) +++ trunk/reactos/ntoskrnl/ke/queue.c 2005-03-14 06:44:31 UTC (rev 14049) @@ -1,11 +1,12 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/ke/queue.c * PURPOSE: Implements kernel queues * - * PROGRAMMERS: Eric Kohl (ekohl(a)rz-online.de) + * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) + * Gunnar Dalsnes + * Eric Kohl (ekohl(a)rz-online.de) */ /* INCLUDES *****************************************************************/ @@ -409,7 +410,7 @@ /* Unwait the Thread */ DPRINT("Unwaiting Thread\n"); WaitBlock = CONTAINING_RECORD(WaitEntry, KWAIT_BLOCK, WaitListEntry); - KiAbortWaitThread(WaitBlock->Thread, (NTSTATUS)QueueEntry); + KiAbortWaitThread(WaitBlock->Thread, (NTSTATUS)QueueEntry, IO_NO_INCREMENT); } } } _____ Modified: trunk/reactos/ntoskrnl/ke/sem.c --- trunk/reactos/ntoskrnl/ke/sem.c 2005-03-14 05:54:58 UTC (rev 14048) +++ trunk/reactos/ntoskrnl/ke/sem.c 2005-03-14 06:44:31 UTC (rev 14049) @@ -111,7 +111,7 @@ if (InitialState == 0 && !IsListEmpty(&Semaphore->Header.WaitListHead)) { /* Wake the Semaphore */ - KiWaitTest(&Semaphore->Header, SEMAPHORE_INCREMENT); + KiWaitTest(&Semaphore->Header, Increment); } /* If the Wait is true, then return with a Wait and don't unlock the Dispatcher Database */ _____ Modified: trunk/reactos/ntoskrnl/ke/timer.c --- trunk/reactos/ntoskrnl/ke/timer.c 2005-03-14 05:54:58 UTC (rev 14048) +++ trunk/reactos/ntoskrnl/ke/timer.c 2005-03-14 06:44:31 UTC (rev 14049) @@ -291,7 +291,7 @@ /* Set it as Signaled */ DPRINT("Setting Timer as Signaled\n"); Timer->Header.SignalState = TRUE; - KiWaitTest(&Timer->Header, 0); + KiWaitTest(&Timer->Header, IO_NO_INCREMENT); /* If the Timer is periodic, reinsert the timer with the new due time */ if (Timer->Period) { _____ Modified: trunk/reactos/ntoskrnl/ke/wait.c --- trunk/reactos/ntoskrnl/ke/wait.c 2005-03-14 05:54:58 UTC (rev 14048) +++ trunk/reactos/ntoskrnl/ke/wait.c 2005-03-14 06:44:31 UTC (rev 14049) @@ -702,7 +702,7 @@ /* All waits satisfied, unwait the thread */ DPRINT("Unwaiting the Thread\n"); - KiAbortWaitThread(CurrentWaitBlock->Thread, CurrentWaitBlock->WaitKey); + KiAbortWaitThread(CurrentWaitBlock->Thread, CurrentWaitBlock->WaitKey, Increment); SkipUnwait: /* Next entry */ @@ -716,7 +716,8 @@ VOID FASTCALL KiAbortWaitThread(PKTHREAD Thread, - NTSTATUS WaitStatus) + NTSTATUS WaitStatus, + KPRIORITY Increment) { PKWAIT_BLOCK WaitBlock; _____ Modified: trunk/reactos/ntoskrnl/ps/kill.c --- trunk/reactos/ntoskrnl/ps/kill.c 2005-03-14 05:54:58 UTC (rev 14048) +++ trunk/reactos/ntoskrnl/ps/kill.c 2005-03-14 06:44:31 UTC (rev 14049) @@ -297,7 +297,7 @@ if (THREAD_STATE_BLOCKED == Thread->Tcb.State && UserMode == Thread->Tcb.WaitMode) { DPRINT("Unblocking thread\n"); - KiAbortWaitThread((PKTHREAD)Thread, STATUS_THREAD_IS_TERMINATING); + KiAbortWaitThread((PKTHREAD)Thread, STATUS_THREAD_IS_TERMINATING, IO_NO_INCREMENT); } KeReleaseDispatcherDatabaseLock(OldIrql); }

19 years, 6 months

[ion] 14048: Forgot this file.

by ion＠svn.reactos.com

Forgot this file. Added: trunk/reactos/ntoskrnl/ob/wait.c _____ Added: trunk/reactos/ntoskrnl/ob/wait.c --- trunk/reactos/ntoskrnl/ob/wait.c 2005-03-14 05:54:32 UTC (rev 14047) +++ trunk/reactos/ntoskrnl/ob/wait.c 2005-03-14 05:54:58 UTC (rev 14048) @@ -0,0 +1,300 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: ntoskrnl/ob/wait.c + * PURPOSE: Handles Waiting on Objects + * + * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) - Created file + * David Welch (welch(a)mcmail.com) + */ + +/* INCLUDES ******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <internal/debug.h> + +/* FUNCTIONS *****************************************************************/ + +BOOL inline FASTCALL KiIsObjectWaitable(PVOID Object); + +NTSTATUS STDCALL +NtWaitForMultipleObjects(IN ULONG ObjectCount, + IN PHANDLE ObjectsArray, + IN WAIT_TYPE WaitType, + IN BOOLEAN Alertable, + IN PLARGE_INTEGER TimeOut OPTIONAL) +{ + KWAIT_BLOCK WaitBlockArray[MAXIMUM_WAIT_OBJECTS]; + HANDLE SafeObjectsArray[MAXIMUM_WAIT_OBJECTS]; + PVOID ObjectPtrArray[MAXIMUM_WAIT_OBJECTS]; + ULONG i, j; + KPROCESSOR_MODE PreviousMode; + LARGE_INTEGER SafeTimeOut; + NTSTATUS Status = STATUS_SUCCESS; + + DPRINT("NtWaitForMultipleObjects(ObjectCount %lu ObjectsArray[] %x, Alertable %d, " + "TimeOut %x)\n", ObjectCount,ObjectsArray,Alertable,TimeOut); + + PreviousMode = ExGetPreviousMode(); + + if (ObjectCount > MAXIMUM_WAIT_OBJECTS) + return STATUS_UNSUCCESSFUL; + if (0 == ObjectCount) + return STATUS_INVALID_PARAMETER; + + if(PreviousMode != KernelMode) + { + _SEH_TRY + { + ProbeForRead(ObjectsArray, + ObjectCount * sizeof(ObjectsArray[0]), + sizeof(ULONG)); + /* make a copy so we don't have to guard with SEH later and keep track of + what objects we referenced in case dereferencing pointers suddenly fails */ + RtlCopyMemory(SafeObjectsArray, ObjectsArray, ObjectCount * sizeof(ObjectsArray[0])); + ObjectsArray = SafeObjectsArray; + + if(TimeOut != NULL) + { + ProbeForRead(TimeOut, + sizeof(LARGE_INTEGER), + sizeof(ULONG)); + /* make a local copy of the timeout on the stack */ + SafeTimeOut = *TimeOut; + TimeOut = &SafeTimeOut; + } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if(!NT_SUCCESS(Status)) + { + return Status; + } + } + + /* reference all objects */ + for (i = 0; i < ObjectCount; i++) + { + Status = ObReferenceObjectByHandle(ObjectsArray[i], + SYNCHRONIZE, + NULL, + PreviousMode, + &ObjectPtrArray[i], + NULL); + if (!NT_SUCCESS(Status) || !KiIsObjectWaitable(ObjectPtrArray[i])) + { + if (NT_SUCCESS(Status)) + { + DPRINT1("Waiting for object type '%wZ' is not supported\n", + &BODY_TO_HEADER(ObjectPtrArray[i])->ObjectType->TypeName); + Status = STATUS_HANDLE_NOT_WAITABLE; + i++; + } + /* dereference all referenced objects */ + for (j = 0; j < i; j++) + { + ObDereferenceObject(ObjectPtrArray[j]); + } + + return(Status); + } + } + + Status = KeWaitForMultipleObjects(ObjectCount, + ObjectPtrArray, + WaitType, + UserRequest, + PreviousMode, + Alertable, + TimeOut, + WaitBlockArray); + + /* dereference all objects */ + for (i = 0; i < ObjectCount; i++) + { + ObDereferenceObject(ObjectPtrArray[i]); + } + + return(Status); +} + + +/* + * @implemented + */ +NTSTATUS STDCALL +NtWaitForSingleObject(IN HANDLE ObjectHandle, + IN BOOLEAN Alertable, + IN PLARGE_INTEGER TimeOut OPTIONAL) +{ + PVOID ObjectPtr; + KPROCESSOR_MODE PreviousMode; + LARGE_INTEGER SafeTimeOut; + NTSTATUS Status = STATUS_SUCCESS; + + DPRINT("NtWaitForSingleObject(ObjectHandle %x, Alertable %d, TimeOut %x)\n", + ObjectHandle,Alertable,TimeOut); + + PreviousMode = ExGetPreviousMode(); + + if(TimeOut != NULL && PreviousMode != KernelMode) + { + _SEH_TRY + { + ProbeForRead(TimeOut, + sizeof(LARGE_INTEGER), + sizeof(ULONG)); + /* make a copy on the stack */ + SafeTimeOut = *TimeOut; + TimeOut = &SafeTimeOut; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if(!NT_SUCCESS(Status)) + { + return Status; + } + } + + Status = ObReferenceObjectByHandle(ObjectHandle, + SYNCHRONIZE, + NULL, + PreviousMode, + &ObjectPtr, + NULL); + if (!NT_SUCCESS(Status)) + { + return(Status); + } + if (!KiIsObjectWaitable(ObjectPtr)) + { + DPRINT1("Waiting for object type '%wZ' is not supported\n", + &BODY_TO_HEADER(ObjectPtr)->ObjectType->TypeName); + Status = STATUS_HANDLE_NOT_WAITABLE; + } + else + { + Status = KeWaitForSingleObject(ObjectPtr, + UserRequest, + PreviousMode, + Alertable, + TimeOut); + } + + ObDereferenceObject(ObjectPtr); + + return(Status); +} + + +NTSTATUS STDCALL +NtSignalAndWaitForSingleObject(IN HANDLE ObjectHandleToSignal, + IN HANDLE WaitableObjectHandle, + IN BOOLEAN Alertable, + IN PLARGE_INTEGER TimeOut OPTIONAL) +{ + KPROCESSOR_MODE PreviousMode; + DISPATCHER_HEADER* hdr; + PVOID SignalObj; + PVOID WaitObj; + LARGE_INTEGER SafeTimeOut; + NTSTATUS Status = STATUS_SUCCESS; + + PreviousMode = ExGetPreviousMode(); + + if(TimeOut != NULL && PreviousMode != KernelMode) + { + _SEH_TRY + { + ProbeForRead(TimeOut, + sizeof(LARGE_INTEGER), + sizeof(ULONG)); + /* make a copy on the stack */ + SafeTimeOut = *TimeOut; + TimeOut = &SafeTimeOut; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if(!NT_SUCCESS(Status)) + { + return Status; + } + } + + Status = ObReferenceObjectByHandle(ObjectHandleToSignal, + 0, + NULL, + PreviousMode, + &SignalObj, + NULL); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + Status = ObReferenceObjectByHandle(WaitableObjectHandle, + SYNCHRONIZE, + NULL, + PreviousMode, + &WaitObj, + NULL); + if (!NT_SUCCESS(Status)) + { + ObDereferenceObject(SignalObj); + return Status; + } + + hdr = (DISPATCHER_HEADER *)SignalObj; + switch (hdr->Type) + { + case EventNotificationObject: + case EventSynchronizationObject: + KeSetEvent(SignalObj, + EVENT_INCREMENT, + TRUE); + break; + + case MutantObject: + KeReleaseMutex(SignalObj, + TRUE); + break; + + case SemaphoreObject: + KeReleaseSemaphore(SignalObj, + SEMAPHORE_INCREMENT, + 1, + TRUE); + break; + + default: + ObDereferenceObject(SignalObj); + ObDereferenceObject(WaitObj); + return STATUS_OBJECT_TYPE_MISMATCH; + } + + Status = KeWaitForSingleObject(WaitObj, + UserRequest, + PreviousMode, + Alertable, + TimeOut); + + ObDereferenceObject(SignalObj); + ObDereferenceObject(WaitObj); + + return Status; +} + +/* EOF */

19 years, 6 months

[ion] 14047: Dispatching & Queue Rewrite II:

by ion＠svn.reactos.com

Dispatching & Queue Rewrite II: - Rewrote wait code. It is now cleaner, more optimized and faster. All waiting functions are now clearly differentiated instead of sharing code. These functions are called up to a dozen times a second, so having dedicated code for each of them is a real boost in speed. - Fixed several queue issues, made a dedicated queue wait/wake function (you are not supposed to use KeWaitFor on a queue, and this is also a speed boost), and make it compatible with new wait code. - Optimized Work Queue code to be much smaller and better organized, by using an array instead of hard-coded multiple static variables. Also, add support for the real NT structures and implementation, paving the road for Dynamic Work Items, which also have timeouts, and deadlock dection + debug info. - Simplified PsBlockThread and made it compatible with wait code. - Added support for priority boosting when unwaiting a thread; will use later, as well as put proper boosting for dispatch objects. - Inlined all dispatcher lock functions and header initialization for speed. - Moved executive wait code into ob. Modified: trunk/reactos/config Modified: trunk/reactos/include/ddk/extypes.h Modified: trunk/reactos/ntoskrnl/Makefile Modified: trunk/reactos/ntoskrnl/ex/init.c Modified: trunk/reactos/ntoskrnl/ex/work.c Modified: trunk/reactos/ntoskrnl/include/internal/ex.h Modified: trunk/reactos/ntoskrnl/include/internal/ke.h Modified: trunk/reactos/ntoskrnl/include/internal/ps.h Modified: trunk/reactos/ntoskrnl/ke/event.c Modified: trunk/reactos/ntoskrnl/ke/i386/tskswitch.S Modified: trunk/reactos/ntoskrnl/ke/kthread.c Modified: trunk/reactos/ntoskrnl/ke/mutex.c Modified: trunk/reactos/ntoskrnl/ke/queue.c Modified: trunk/reactos/ntoskrnl/ke/sem.c Modified: trunk/reactos/ntoskrnl/ke/timer.c Modified: trunk/reactos/ntoskrnl/ke/wait.c Modified: trunk/reactos/ntoskrnl/ntoskrnl.def Modified: trunk/reactos/ntoskrnl/ps/kill.c Modified: trunk/reactos/ntoskrnl/ps/thread.c _____ Modified: trunk/reactos/config --- trunk/reactos/config 2005-03-14 04:51:51 UTC (rev 14046) +++ trunk/reactos/config 2005-03-14 05:54:32 UTC (rev 14047) @@ -5,7 +5,6 @@ # Possible values in the future: alpha,i386,m68k,mips,powerpc ARCH := i386 - # # Which cpu should reactos optimize for # example : i486, i586, pentium, pentium2, pentium3, pentium4 @@ -33,11 +32,6 @@ CONFIG_SMP := 0 # -# whether to use a 3GB User, 1GB Kernel memory map -# -3GB := 0 - -# # Which version of NDIS do we support up to? # #NDISVERSION=NDIS50 _____ Modified: trunk/reactos/include/ddk/extypes.h --- trunk/reactos/include/ddk/extypes.h 2005-03-14 04:51:51 UTC (rev 14046) +++ trunk/reactos/include/ddk/extypes.h 2005-03-14 05:54:32 UTC (rev 14047) @@ -30,6 +30,22 @@ MaximumWorkQueue } WORK_QUEUE_TYPE; +typedef struct _EX_QUEUE_WORKER_INFO { + UCHAR QueueDisabled:1; + UCHAR MakeThreadsAsNecessary:1; + UCHAR WaitMode:1; + ULONG WorkerCount:29; +} EX_QUEUE_WORKER_INFO, *PEX_QUEUE_WORKER_INFO; + +typedef struct _EX_WORK_QUEUE { + KQUEUE WorkerQueue; + ULONG DynamicThreadCount; + ULONG WorkItemsProcessed; + ULONG WorkItemsProcessedLastPass; + ULONG QueueDepthLastPass; + EX_QUEUE_WORKER_INFO Info; +} EX_WORK_QUEUE, *PEX_WORK_QUEUE; + typedef ULONG_PTR ERESOURCE_THREAD, *PERESOURCE_THREAD; typedef struct _OWNER_ENTRY _____ Modified: trunk/reactos/ntoskrnl/Makefile --- trunk/reactos/ntoskrnl/Makefile 2005-03-14 04:51:51 UTC (rev 14046) +++ trunk/reactos/ntoskrnl/Makefile 2005-03-14 05:54:32 UTC (rev 14047) @@ -212,7 +212,8 @@ ob/object.o \ ob/sdcache.o \ ob/security.o \ - ob/symlink.o + ob/symlink.o \ + ob/wait.o # Process Manager (Ps) OBJECTS_PS = \ _____ Modified: trunk/reactos/ntoskrnl/ex/init.c --- trunk/reactos/ntoskrnl/ex/init.c 2005-03-14 04:51:51 UTC (rev 14046) +++ trunk/reactos/ntoskrnl/ex/init.c 2005-03-14 05:54:32 UTC (rev 14047) @@ -27,11 +27,9 @@ extern ULONG_PTR LastKernelAddress; extern LOADER_MODULE KeLoaderModules[64]; extern PRTL_MESSAGE_RESOURCE_DATA KiBugCodeMessages; -#if 0 extern LIST_ENTRY KiProfileListHead; extern LIST_ENTRY KiProfileSourceListHead; extern KSPIN_LOCK KiProfileLock; -#endif VOID PspPostInitSystemProcess(VOID); @@ -427,12 +425,10 @@ /* Bring back the IRQL to Passive */ KeLowerIrql(PASSIVE_LEVEL); -#if 0 /* Initialize Profiling */ InitializeListHead(&KiProfileListHead); InitializeListHead(&KiProfileSourceListHead); KeInitializeSpinLock(&KiProfileLock); -#endif /* Load basic Security for other Managers */ if (!SeInit1()) KEBUGCHECK(SECURITY_INITIALIZATION_FAILED); @@ -488,7 +484,7 @@ PspPostInitSystemProcess(); /* initialize the worker threads */ - ExInitializeWorkerThreads(); + ExpInitializeWorkerThreads(); /* initialize callbacks */ ExpInitializeCallbacks(); _____ Modified: trunk/reactos/ntoskrnl/ex/work.c --- trunk/reactos/ntoskrnl/ex/work.c 2005-03-14 04:51:51 UTC (rev 14046) +++ trunk/reactos/ntoskrnl/ex/work.c 2005-03-14 05:54:32 UTC (rev 14047) @@ -1,11 +1,11 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/ex/work.c * PURPOSE: Manage system work queues * - * PROGRAMMERS: David Welch (welch(a)mcmail.com) + * PROGRAMMERS: Alex Ionescu - Used correct work queue array and added some fixes and checks. + * Gunnar Dalsnes - Implemented */ /* INCLUDES ******************************************************************/ @@ -25,17 +25,10 @@ /* * PURPOSE: Queue of items waiting to be processed at normal priority */ -KQUEUE EiNormalWorkQueue; +EX_WORK_QUEUE ExWorkerQueue[MaximumWorkQueue]; -KQUEUE EiCriticalWorkQueue; - -KQUEUE EiHyperCriticalWorkQueue; - /* FUNCTIONS ****************************************************************/ -//static NTSTATUS STDCALL -static VOID STDCALL -ExWorkerThreadEntryPoint(IN PVOID context) /* * FUNCTION: Entry point for a worker thread * ARGUMENTS: @@ -44,161 +37,138 @@ * NOTE: To kill a worker thread you must queue an item whose callback * calls PsTerminateSystemThread */ +static +VOID +STDCALL +ExpWorkerThreadEntryPoint(IN PVOID Context) { - - PWORK_QUEUE_ITEM item; - PLIST_ENTRY current; + PWORK_QUEUE_ITEM WorkItem; + PLIST_ENTRY QueueEntry; + WORK_QUEUE_TYPE WorkQueueType; + PEX_WORK_QUEUE WorkQueue; - while (TRUE) - { - current = KeRemoveQueue( (PKQUEUE)context, KernelMode, NULL ); + /* Get Queue Type and Worker Queue */ + WorkQueueType = (WORK_QUEUE_TYPE)Context; + WorkQueue = &ExWorkerQueue[WorkQueueType]; + + /* Loop forever */ + while (TRUE) { + + /* Wait for Something to Happen on the Queue */ + QueueEntry = KeRemoveQueue(&WorkQueue->WorkerQueue, KernelMode, NULL); - /* can't happend since we do a KernelMode wait (and we're a system thread) */ - ASSERT((NTSTATUS)current != STATUS_USER_APC); + /* Can't happen since we do a KernelMode wait (and we're a system thread) */ + ASSERT((NTSTATUS)QueueEntry != STATUS_USER_APC); - /* this should never happend either, since we wait with NULL timeout, - * but there's a slight possibility that STATUS_TIMEOUT is returned - * at queue rundown in NT (unlikely) -Gunnar - */ - ASSERT((NTSTATUS)current != STATUS_TIMEOUT); - - /* based on INVALID_WORK_QUEUE_ITEM bugcheck desc. */ - if (current->Flink == NULL || current->Blink == NULL) - { - KeBugCheck(INVALID_WORK_QUEUE_ITEM); - } - - /* "reinitialize" item (same as done in ExInitializeWorkItem) */ - current->Flink = NULL; - - item = CONTAINING_RECORD( current, WORK_QUEUE_ITEM, List); - item->WorkerRoutine(item->Parameter); - - if (KeGetCurrentIrql() != PASSIVE_LEVEL) - { - KeBugCheck(IRQL_NOT_LESS_OR_EQUAL); - } - } - + /* this should never happen either, since we wait with NULL timeout, + * but there's a slight possibility that STATUS_TIMEOUT is returned + * at queue rundown in NT (unlikely) -Gunnar + */ + ASSERT((NTSTATUS)QueueEntry != STATUS_TIMEOUT); + + /* Increment Processed Work Items */ + InterlockedIncrement(&WorkQueue->WorkItemsProcessed); + + /* Get the Work Item */ + WorkItem = CONTAINING_RECORD(QueueEntry, WORK_QUEUE_ITEM, List); + + /* Call the Worker Routine */ + WorkItem->WorkerRoutine(WorkItem->Parameter); + + /* Make sure it returned at right IRQL */ + if (KeGetCurrentIrql() != PASSIVE_LEVEL) { + + /* FIXME: Make this an Ex */ + KEBUGCHECK(WORKER_THREAD_RETURNED_AT_BAD_IRQL); + } + + /* Make sure it returned with Impersionation Disabled */ + if (PsGetCurrentThread()->ActiveImpersonationInfo) { + + /* FIXME: Make this an Ex */ + KEBUGCHECK(IMPERSONATING_WORKER_THREAD); + } + } } -static VOID ExInitializeWorkQueue(PKQUEUE WorkQueue, - KPRIORITY Priority) +static +VOID +STDCALL +ExpInitializeWorkQueue(WORK_QUEUE_TYPE WorkQueueType, + KPRIORITY Priority) { ULONG i; PETHREAD Thread; HANDLE hThread; - NTSTATUS Status; - - PAGED_CODE(); - + /* Loop through how many threads we need to create */ for (i = 0; i < NUMBER_OF_WORKER_THREADS; i++) { - + /* Create the System Thread */ - Status = PsCreateSystemThread(&hThread, - THREAD_ALL_ACCESS, - NULL, - NULL, - NULL, - ExWorkerThreadEntryPoint, - (PVOID)WorkQueue); - if(NT_SUCCESS(Status)) - { - /* Get the Thread */ - Status = ObReferenceObjectByHandle(hThread, - THREAD_SET_INFORMATION, - PsThreadType, - KernelMode, - (PVOID*)&Thread, - NULL); - - if(NT_SUCCESS(Status)) - { - /* Set the Priority */ - KeSetPriorityThread(&Thread->Tcb, Priority); - - /* Dereference and close handle */ - ObDereferenceObject(Thread); - ZwClose(hThread); - } - else - { - DPRINT1("Unable to reference worker thread handle 0x%x, Status: 0x%x!\n", hThread, Status); - KEBUGCHECK(0); - } - } - else - { - DPRINT1("Unable to create worker thread, Status: 0x%x!\n", Status); - KEBUGCHECK(0); - } + PsCreateSystemThread(&hThread, + THREAD_ALL_ACCESS, + NULL, + NULL, + NULL, + ExpWorkerThreadEntryPoint, + (PVOID)WorkQueueType); + + /* Get the Thread */ + ObReferenceObjectByHandle(hThread, + THREAD_SET_INFORMATION, + PsThreadType, + KernelMode, + (PVOID*)&Thread, + NULL); + + /* Set the Priority */ + KeSetPriorityThread(&Thread->Tcb, Priority); + + /* Dereference and close handle */ + ObDereferenceObject(Thread); + ZwClose(hThread); } } -VOID INIT_FUNCTION -ExInitializeWorkerThreads(VOID) +VOID +INIT_FUNCTION +ExpInitializeWorkerThreads(VOID) { - KeInitializeQueue( &EiNormalWorkQueue, NUMBER_OF_WORKER_THREADS ); - KeInitializeQueue( &EiCriticalWorkQueue , NUMBER_OF_WORKER_THREADS ); - KeInitializeQueue( &EiHyperCriticalWorkQueue , NUMBER_OF_WORKER_THREADS ); - - ExInitializeWorkQueue(&EiNormalWorkQueue, - LOW_PRIORITY); - ExInitializeWorkQueue(&EiCriticalWorkQueue, - LOW_REALTIME_PRIORITY); - ExInitializeWorkQueue(&EiHyperCriticalWorkQueue, - HIGH_PRIORITY); + ULONG WorkQueueType; + + /* Initialize the Array */ + for (WorkQueueType = 0; WorkQueueType < MaximumWorkQueue; WorkQueueType++) { + + RtlZeroMemory(&ExWorkerQueue[WorkQueueType], sizeof(EX_WORK_QUEUE)); + KeInitializeQueue(&ExWorkerQueue[WorkQueueType].WorkerQueue, 0); + } + + /* Create the built-in worker threads for each work queue */ + ExpInitializeWorkQueue(CriticalWorkQueue, LOW_REALTIME_PRIORITY); + ExpInitializeWorkQueue(DelayedWorkQueue, LOW_PRIORITY); + ExpInitializeWorkQueue(HyperCriticalWorkQueue, HIGH_PRIORITY); } /* * @implemented - */ -VOID STDCALL -ExQueueWorkItem (PWORK_QUEUE_ITEM WorkItem, - WORK_QUEUE_TYPE QueueType) -/* + * * FUNCTION: Inserts a work item in a queue for one of the system worker * threads to process * ARGUMENTS: * WorkItem = Item to insert * QueueType = Queue to insert it in */ +VOID +STDCALL +ExQueueWorkItem(PWORK_QUEUE_ITEM WorkItem, + WORK_QUEUE_TYPE QueueType) { ASSERT(WorkItem!=NULL); ASSERT_IRQL(DISPATCH_LEVEL); ASSERT(WorkItem->List.Flink == NULL); - /* - * Insert the item in the appropiate queue and wake up any thread - * waiting for something to do - */ - switch(QueueType) - { - case DelayedWorkQueue: - KeInsertQueue ( - &EiNormalWorkQueue, - &WorkItem->List - ); - break; - - case CriticalWorkQueue: - KeInsertQueue ( - &EiCriticalWorkQueue, - &WorkItem->List - ); - break; - - case HyperCriticalWorkQueue: - KeInsertQueue ( - &EiHyperCriticalWorkQueue, - &WorkItem->List - ); - break; - - default: - break; - - } + + /* Insert the Queue */ + KeInsertQueue(&ExWorkerQueue[QueueType].WorkerQueue, &WorkItem->List); } /* EOF */ _____ Modified: trunk/reactos/ntoskrnl/include/internal/ex.h --- trunk/reactos/ntoskrnl/include/internal/ex.h 2005-03-14 04:51:51 UTC (rev 14046) +++ trunk/reactos/ntoskrnl/include/internal/ex.h 2005-03-14 05:54:32 UTC (rev 14047) @@ -86,8 +86,10 @@ extern ULONG ExpTimeZoneId; extern POBJECT_TYPE ExEventPairObjectType; +extern POBJECT_TYPE EXPORTED ExMutantObjectType; +extern POBJECT_TYPE EXPORTED ExSemaphoreObjectType; +extern POBJECT_TYPE EXPORTED ExTimerType; - /* INITIALIZATION FUNCTIONS *************************************************/ VOID @@ -100,7 +102,7 @@ VOID ExpInitTimeZoneInfo(VOID); VOID -ExInitializeWorkerThreads(VOID); +ExpInitializeWorkerThreads(VOID); VOID ExpInitLookasideLists(VOID); VOID _____ Modified: trunk/reactos/ntoskrnl/include/internal/ke.h --- trunk/reactos/ntoskrnl/include/internal/ke.h 2005-03-14 04:51:51 UTC (rev 14046) +++ trunk/reactos/ntoskrnl/include/internal/ke.h 2005-03-14 05:54:32 UTC (rev 14047) @@ -139,34 +139,39 @@ IN KPROFILE_SOURCE Source ); -VOID KiInsertProfileIntoProcess(PLIST_ENTRY ListHead, PKPROFILE Profile); -VOID KiInsertProfile(PKPROFILE Profile); -VOID KiRemoveProfile(PKPROFILE Profile); -VOID STDCALL KiDeleteProfile(PVOID ObjectBody); - VOID STDCALL KeUpdateSystemTime(PKTRAP_FRAME TrapFrame, KIRQL Irql); VOID STDCALL KeUpdateRunTime(PKTRAP_FRAME TrapFrame, KIRQL Irql); VOID STDCALL KiExpireTimers(PKDPC Dpc, PVOID DeferredContext, PVOID SystemArgument1, PVOID SystemArgument2); -KIRQL KeAcquireDispatcherDatabaseLock(VOID); -VOID KeAcquireDispatcherDatabaseLockAtDpcLevel(VOID); -VOID KeReleaseDispatcherDatabaseLock(KIRQL Irql); -VOID KeReleaseDispatcherDatabaseLockFromDpcLevel(VOID); +KIRQL inline FASTCALL KeAcquireDispatcherDatabaseLock(VOID); +VOID inline FASTCALL KeAcquireDispatcherDatabaseLockAtDpcLevel(VOID); +VOID inline FASTCALL KeReleaseDispatcherDatabaseLock(KIRQL Irql); +VOID inline FASTCALL KeReleaseDispatcherDatabaseLockFromDpcLevel(VOID); BOOLEAN KiDispatcherObjectWake(DISPATCHER_HEADER* hdr, KPRIORITY increment); VOID STDCALL KeExpireTimers(PKDPC Apc, PVOID Arg1, PVOID Arg2, PVOID Arg3); -VOID KeInitializeDispatcherHeader(DISPATCHER_HEADER* Header, ULONG Type, - ULONG Size, ULONG SignalState); +VOID inline FASTCALL KeInitializeDispatcherHeader(DISPATCHER_HEADER* Header, ULONG Type, + ULONG Size, ULONG SignalState); VOID KeDumpStackFrames(PULONG Frame); BOOLEAN KiTestAlert(VOID); -BOOLEAN KiAbortWaitThread(struct _KTHREAD* Thread, NTSTATUS WaitStatus); +VOID FASTCALL KiAbortWaitThread(struct _KTHREAD* Thread, NTSTATUS WaitStatus); + +BOOLEAN STDCALL KiInsertTimer(PKTIMER Timer, LARGE_INTEGER DueTime); +VOID inline FASTCALL KiSatisfyObjectWait(PDISPATCHER_HEADER Object, PKTHREAD Thread); + +BOOLEAN inline FASTCALL KiIsObjectSignaled(PDISPATCHER_HEADER Object, PKTHREAD Thread); + +VOID inline FASTCALL KiSatisifyMultipleObjectWaits(PKWAIT_BLOCK WaitBlock); + +VOID FASTCALL KiWaitTest(PDISPATCHER_HEADER Object, KPRIORITY Increment); + PULONG KeGetStackTopThread(struct _ETHREAD* Thread); VOID KeContextToTrapFrame(PCONTEXT Context, PKTRAP_FRAME TrapFrame); VOID STDCALL KiDeliverApc(KPROCESSOR_MODE PreviousMode, @@ -191,6 +196,7 @@ KeTestAlertThread(IN KPROCESSOR_MODE AlertMode); BOOLEAN STDCALL KeRemoveQueueApc (PKAPC Apc); +VOID FASTCALL KiWakeQueue(IN PKQUEUE Queue); PLIST_ENTRY STDCALL KeRundownQueue(IN PKQUEUE Queue); extern LARGE_INTEGER SystemBootTime; @@ -202,7 +208,7 @@ VOID KeInitTimer(VOID); VOID KeInitDpc(struct _KPRCB* Prcb); VOID KeInitDispatcher(VOID); -VOID KeInitializeDispatcher(VOID); +VOID inline FASTCALL KeInitializeDispatcher(VOID); VOID KiInitializeSystemClock(VOID); VOID KiInitializeBugCheck(VOID); VOID Phase1Initialization(PVOID Context); _____ Modified: trunk/reactos/ntoskrnl/include/internal/ps.h --- trunk/reactos/ntoskrnl/include/internal/ps.h 2005-03-14 04:51:51 UTC (rev 14046) +++ trunk/reactos/ntoskrnl/include/internal/ps.h 2005-03-14 05:54:32 UTC (rev 14047) @@ -525,8 +525,11 @@ ULONG PsEnumThreadsByProcess(PEPROCESS Process); PEPROCESS PsGetNextProcess(PEPROCESS OldProcess); VOID -PsBlockThread(PNTSTATUS Status, UCHAR Alertable, ULONG WaitMode, - BOOLEAN DispatcherLock, KIRQL WaitIrql, UCHAR WaitReason); +STDCALL +PsBlockThread(PNTSTATUS Status, + UCHAR Alertable, + ULONG WaitMode, + UCHAR WaitReason); VOID PsUnblockThread(PETHREAD Thread, PNTSTATUS WaitStatus, KPRIORITY Increment); VOID _____ Modified: trunk/reactos/ntoskrnl/ke/event.c --- trunk/reactos/ntoskrnl/ke/event.c 2005-03-14 04:51:51 UTC (rev 14046) +++ trunk/reactos/ntoskrnl/ke/event.c 2005-03-14 05:54:32 UTC (rev 14047) @@ -91,7 +91,7 @@ Event->Header.SignalState = 1; /* Wake the Event */ - KiDispatcherObjectWake(&Event->Header, Increment); + KiWaitTest(&Event->Header, Increment); } /* Unsignal it */ @@ -196,7 +196,7 @@ /* We must do a full wait satisfaction */ DPRINT("Notification Event or WaitAll, Wait on the Event and Signal\n"); Event->Header.SignalState = 1; - KiDispatcherObjectWake(&Event->Header, Increment); + KiWaitTest(&Event->Header, Increment); } } else { _____ Modified: trunk/reactos/ntoskrnl/ke/i386/tskswitch.S --- trunk/reactos/ntoskrnl/ke/i386/tskswitch.S 2005-03-14 04:51:51 UTC (rev 14046) +++ trunk/reactos/ntoskrnl/ke/i386/tskswitch.S 2005-03-14 05:54:32 UTC (rev 14047) @@ -204,7 +204,7 @@ */ sti - call _KeReleaseDispatcherDatabaseLockFromDpcLevel + call @KeReleaseDispatcherDatabaseLockFromDpcLevel@0 cmpl $0, _PiNrThreadsAwaitingReaping je 5f _____ Modified: trunk/reactos/ntoskrnl/ke/kthread.c --- trunk/reactos/ntoskrnl/ke/kthread.c 2005-03-14 04:51:51 UTC (rev 14046) +++ trunk/reactos/ntoskrnl/ke/kthread.c 2005-03-14 05:54:32 UTC (rev 14047) @@ -56,7 +56,7 @@ /* Signal and satisfy */ Thread->SuspendSemaphore.Header.SignalState++; - KiDispatcherObjectWake(&Thread->SuspendSemaphore.Header, IO_NO_INCREMENT); + KiWaitTest(&Thread->SuspendSemaphore.Header, IO_NO_INCREMENT); } } _____ Modified: trunk/reactos/ntoskrnl/ke/mutex.c --- trunk/reactos/ntoskrnl/ke/mutex.c 2005-03-14 04:51:51 UTC (rev 14046) +++ trunk/reactos/ntoskrnl/ke/mutex.c 2005-03-14 05:54:32 UTC (rev 14047) @@ -177,7 +177,7 @@ /* Wake the Mutant */ DPRINT("Waking the Mutant\n"); - KiDispatcherObjectWake(&Mutant->Header, Increment); + KiWaitTest(&Mutant->Header, Increment); } } _____ Modified: trunk/reactos/ntoskrnl/ke/queue.c --- trunk/reactos/ntoskrnl/ke/queue.c 2005-03-14 04:51:51 UTC (rev 14046) +++ trunk/reactos/ntoskrnl/ke/queue.c 2005-03-14 05:54:32 UTC (rev 14047) @@ -16,245 +16,483 @@ /* FUNCTIONS *****************************************************************/ - +LONG STDCALL KiInsertQueue(IN PKQUEUE Queue, IN PLIST_ENTRY Entry, BOOLEAN Head); + /* * @implemented */ -VOID STDCALL +VOID +STDCALL KeInitializeQueue(IN PKQUEUE Queue, - IN ULONG Count OPTIONAL) + IN ULONG Count OPTIONAL) { - KeInitializeDispatcherHeader(&Queue->Header, - QueueObject, - sizeof(KQUEUE)/sizeof(ULONG), - 0); - InitializeListHead(&Queue->EntryListHead); - InitializeListHead(&Queue->ThreadListHead); - Queue->CurrentCount = 0; - Queue->MaximumCount = (Count == 0) ? (ULONG) KeNumberProcessors : Count; + DPRINT("KeInitializeQueue %x\n", Queue); + + /* Initialize the Header */ + KeInitializeDispatcherHeader(&Queue->Header, + QueueObject, + sizeof(KQUEUE)/sizeof(ULONG), + 0); + + /* Initialize the Lists */ + InitializeListHead(&Queue->EntryListHead); + InitializeListHead(&Queue->ThreadListHead); + + /* Set the Current and Maximum Count */ + Queue->CurrentCount = 0; + Queue->MaximumCount = (Count == 0) ? (ULONG) KeNumberProcessors : Count; } - /* * @implemented - * - * Returns number of entries in the queue */ -LONG STDCALL -KeReadStateQueue(IN PKQUEUE Queue) +LONG +STDCALL +KeInsertHeadQueue(IN PKQUEUE Queue, + IN PLIST_ENTRY Entry) { - return(Queue->Header.SignalState); -} - -/* - * Returns the previous number of entries in the queue - */ -LONG STDCALL -KiInsertQueue( - IN PKQUEUE Queue, - IN PLIST_ENTRY Entry, - BOOLEAN Head - ) -{ - ULONG InitialState; - - DPRINT("KiInsertQueue(Queue %x, Entry %x)\n", Queue, Entry); + LONG PreviousState; + KIRQL OldIrql; + + DPRINT("KeInsertHeadQueue %x\n", Queue); + + /* Lock the Dispatcher Database */ + OldIrql = KeAcquireDispatcherDatabaseLock(); + + /* Insert the Queue */ + PreviousState = KiInsertQueue(Queue, Entry, TRUE); + + /* Release the Dispatcher Lock */ + KeReleaseDispatcherDatabaseLock(OldIrql); - InitialState = Queue->Header.SignalState; - - if (Head) - { - InsertHeadList(&Queue->EntryListHead, Entry); - } - else - { - InsertTailList(&Queue->EntryListHead, Entry); - } - - //inc. num entries in queue - Queue->Header.SignalState++; - - /* Why the KeGetCurrentThread()->Queue != Queue? - * KiInsertQueue might be called from an APC for the current thread. - * -Gunnar - */ - if (Queue->CurrentCount < Queue->MaximumCount && - !IsListEmpty(&Queue->Header.WaitListHead) && - KeGetCurrentThread()->Queue != Queue) - { - KiDispatcherObjectWake(&Queue->Header, IO_NO_INCREMENT); - } - - return InitialState; + /* Return previous State */ + return PreviousState; } - - /* * @implemented */ LONG STDCALL -KeInsertHeadQueue(IN PKQUEUE Queue, - IN PLIST_ENTRY Entry) +KeInsertQueue(IN PKQUEUE Queue, + IN PLIST_ENTRY Entry) { - LONG Result; - KIRQL OldIrql; + LONG PreviousState; + KIRQL OldIrql; + + DPRINT("KeInsertQueue %x\n", Queue); + + /* Lock the Dispatcher Database */ + OldIrql = KeAcquireDispatcherDatabaseLock(); + + /* Insert the Queue */ + PreviousState = KiInsertQueue(Queue, Entry, FALSE); + + /* Release the Dispatcher Lock */ + KeReleaseDispatcherDatabaseLock(OldIrql); - OldIrql = KeAcquireDispatcherDatabaseLock(); - Result = KiInsertQueue(Queue,Entry,TRUE); - KeReleaseDispatcherDatabaseLock(OldIrql); - - return Result; + /* Return previous State */ + return PreviousState; } - /* * @implemented + * + * Returns number of entries in the queue */ -LONG STDCALL -KeInsertQueue(IN PKQUEUE Queue, - IN PLIST_ENTRY Entry) +LONG +STDCALL +KeReadStateQueue(IN PKQUEUE Queue) { - LONG Result; - KIRQL OldIrql; - - OldIrql = KeAcquireDispatcherDatabaseLock(); - Result = KiInsertQueue(Queue,Entry,FALSE); - KeReleaseDispatcherDatabaseLock(OldIrql); - - return Result; + /* Returns the Signal State */ + return(Queue->Header.SignalState); } - /* * @implemented */ -PLIST_ENTRY STDCALL +PLIST_ENTRY +STDCALL KeRemoveQueue(IN PKQUEUE Queue, - IN KPROCESSOR_MODE WaitMode, - IN PLARGE_INTEGER Timeout OPTIONAL) + IN KPROCESSOR_MODE WaitMode, + IN PLARGE_INTEGER Timeout OPTIONAL) { - PLIST_ENTRY ListEntry; - NTSTATUS Status; - PKTHREAD Thread = KeGetCurrentThread(); - KIRQL OldIrql; + PLIST_ENTRY ListEntry; + NTSTATUS Status; + PKTHREAD Thread = KeGetCurrentThread(); + KIRQL OldIrql; + PKQUEUE PreviousQueue; + PKWAIT_BLOCK WaitBlock; + PKWAIT_BLOCK TimerWaitBlock; + PKTIMER Timer; - OldIrql = KeAcquireDispatcherDatabaseLock (); + DPRINT("KeRemoveQueue %x\n", Queue); + + /* Check if the Lock is already held */ + if (Thread->WaitNext) { + + DPRINT("Lock is already held\n"); + + } else { + + /* Lock the Dispatcher Database */ + DPRINT("Lock not held, acquiring\n"); + OldIrql = KeAcquireDispatcherDatabaseLock(); + Thread->WaitIrql = OldIrql; + } - if (Thread->Queue != Queue) - { - /* - * INVESTIGATE: What is the Thread->QueueListEntry used for? It's linked it into the - * Queue->ThreadListHead when the thread registers with the queue and unlinked when - * the thread registers with a new queue. The Thread->Queue already tells us what - * queue the thread is registered with. - * -Gunnar - */ + /* This is needed so that we can set the new queue right here, before additional processing */ + PreviousQueue = Thread->Queue; + Thread->Queue = Queue; - //unregister thread from previous queue (if any) - if (Thread->Queue) - { - RemoveEntryList(&Thread->QueueListEntry); - Thread->Queue->CurrentCount--; - - if (Thread->Queue->CurrentCount < Thread->Queue->MaximumCount && - !IsListEmpty(&Thread->Queue->EntryListHead)) - { - KiDispatcherObjectWake(&Thread->Queue->Header, 0); - } + /* Check if this is a different queue */ + if (Queue != PreviousQueue) { + + /* + * INVESTIGATE: What is the Thread->QueueListEntry used for? It's linked it into the + * Queue->ThreadListHead when the thread registers with the queue and unlinked when + * the thread registers with a new queue. The Thread->Queue already tells us what + * queue the thread is registered with. + * -Gunnar + */ + DPRINT("Different Queue\n"); + if (PreviousQueue) { + + /* Remove from this list */ + DPRINT("Removing Old Queue\n"); + RemoveEntryList(&Thread->QueueListEntry); + + /* Wake the queue */ + DPRINT("Activating new thread\n"); + KiWakeQueue(PreviousQueue); } - // register thread with this queue - InsertTailList(&Queue->ThreadListHead, &Thread->QueueListEntry); - Thread->Queue = Queue; - } - else /* if (Thread->Queue == Queue) */ - { - //dec. num running threads - Queue->CurrentCount--; - } + /* Insert in this new Queue */ + DPRINT("Inserting new Queue!\n"); + InsertTailList(&Queue->ThreadListHead, &Thread->QueueListEntry); - - - - while (TRUE) - { - if (Queue->CurrentCount < Queue->MaximumCount && !IsListEmpty(&Queue->EntryListHead)) - { - ListEntry = RemoveHeadList(&Queue->EntryListHead); - //dec. num entries in queue - Queue->Header.SignalState--; - //inc. num running threads - Queue->CurrentCount++; - - KeReleaseDispatcherDatabaseLock(OldIrql); - return ListEntry; - } - else - { - //inform KeWaitXxx that we are holding disp. lock - Thread->WaitNext = TRUE; - Thread->WaitIrql = OldIrql; + } else { + + /* Same queue, decrement waiting threads */ + DPRINT("Same Queue!\n"); + Queue->CurrentCount--; + } + + /* Loop until the queue is processed */ + while (TRUE) { + + /* Get the Entry */ + ListEntry = Queue->EntryListHead.Flink; + + /* Check if the counts are valid and if there is still a queued entry */ + if ((Queue->CurrentCount < Queue->MaximumCount) && + (ListEntry != &Queue->EntryListHead)) { + + /* Remove the Entry and Save it */ + DPRINT("Removing Queue Entry. CurrentCount: %d, Maximum Count: %d\n", + Queue->CurrentCount, Queue->MaximumCount); + ListEntry = RemoveHeadList(&Queue->EntryListHead); + + /* Decrease the number of entries */ + Queue->Header.SignalState--; + + /* Increase numbef of running threads */ + Queue->CurrentCount++; + + /* Check if the entry is valid. If not, bugcheck */ + if (!ListEntry->Flink || !ListEntry->Blink) { + + KEBUGCHECK(INVALID_WORK_QUEUE_ITEM); + } + + /* Remove the Entry */ + RemoveEntryList(ListEntry); + ListEntry->Flink = NULL; + + /* Nothing to wait on */ + break; + + } else { + + /* Do the wait */ + DPRINT("Waiting on Queue Entry. CurrentCount: %d, Maximum Count: %d\n", + Queue->CurrentCount, Queue->MaximumCount); + + /* Use the Thread's Wait Block, it's big enough */ + Thread->WaitBlockList = &Thread->WaitBlock[0]; + + /* Fail if there's an APC Pending */ + if (WaitMode == UserMode && Thread->ApcState.UserApcPending) { + + /* Return the status and increase the pending threads */ + ListEntry = (PLIST_ENTRY)STATUS_USER_APC; + Queue->CurrentCount++; + + /* Nothing to wait on */ + break; + } + + /* Build the Wait Block */ + WaitBlock = &Thread->WaitBlock[0]; + WaitBlock->Object = (PVOID)Queue; + WaitBlock->WaitKey = STATUS_SUCCESS; + WaitBlock->WaitType = WaitAny; + WaitBlock->Thread = Thread; + WaitBlock->NextWaitBlock = NULL; + + Thread->WaitStatus = STATUS_SUCCESS; + + /* We need to wait for the object... check if we have a timeout */ + if (Timeout) { + + /* If it's zero, then don't do any waiting */ + if (!Timeout->QuadPart) { + + /* Instant Timeout, return the status and increase the pending threads */ + DPRINT("Queue Wait has timed out\n"); + ListEntry = (PLIST_ENTRY)STATUS_TIMEOUT; + Queue->CurrentCount++; + + /* Nothing to wait on */ + break; + } + + /* + * Set up the Timer. We'll use the internal function so that we can + * hold on to the dispatcher lock. + */ + Timer = &Thread->Timer; + TimerWaitBlock = &Thread->WaitBlock[1]; - Status = KeWaitForSingleObject(Queue, - WrQueue, - WaitMode, - TRUE, //bAlertable - Timeout); - - if (Status == STATUS_TIMEOUT || Status == STATUS_USER_APC) - { - return (PVOID)Status; - } - - OldIrql = KeAcquireDispatcherDatabaseLock (); - } - } + /* Set up the Timer Wait Block */ + TimerWaitBlock->Object = (PVOID)Timer; + TimerWaitBlock->Thread = Thread; + TimerWaitBlock->WaitKey = STATUS_TIMEOUT; + TimerWaitBlock->WaitType = WaitAny; + TimerWaitBlock->NextWaitBlock = NULL; + + /* Link the timer to this Wait Block */ + InitializeListHead(&Timer->Header.WaitListHead); [truncated at 1000 lines; 2258 more skipped]

19 years, 6 months

[ion] 14046: Do not assume that a debugger is present only because we are debugging to a file or to the screen. This corrects bugchecks not to launch an INT3 where no debugger is actually there to catch it.

by ion＠svn.reactos.com

Do not assume that a debugger is present only because we are debugging to a file or to the screen. This corrects bugchecks not to launch an INT3 where no debugger is actually there to catch it. Modified: trunk/reactos/ntoskrnl/kd/kdebug.c _____ Modified: trunk/reactos/ntoskrnl/kd/kdebug.c --- trunk/reactos/ntoskrnl/kd/kdebug.c 2005-03-14 02:08:17 UTC (rev 14045) +++ trunk/reactos/ntoskrnl/kd/kdebug.c 2005-03-14 04:51:51 UTC (rev 14046) @@ -118,7 +118,7 @@ if (!_strnicmp(p2, "SCREEN", 6) && BootPhase > 0) { p2 += 6; - KdDebuggerEnabled = TRUE; + KdDebuggerEnabled = FALSE; KdDebugState |= KD_DEBUG_SCREEN; } else if (!_strnicmp(p2, "BOCHS", 5) && BootPhase == 0) @@ -150,7 +150,7 @@ Value = (ULONG)atol(p2); if (Value > 0 && Value < 5) { - KdDebuggerEnabled = TRUE; + KdDebuggerEnabled = FALSE; KdDebugState |= KD_DEBUG_SERIAL; LogPortInfo.ComPort = Value; } @@ -158,7 +158,7 @@ else if (!_strnicmp(p2, "FILE", 4) && BootPhase > 0) { p2 += 4; - KdDebuggerEnabled = TRUE; + KdDebuggerEnabled = FALSE; KdDebugState |= KD_DEBUG_FILELOG; } else if (!_strnicmp(p2, "MDA", 3) && BootPhase > 0) @@ -247,8 +247,6 @@ } /* Perform any initialization nescessary */ - if (KdDebuggerEnabled == TRUE) - { if (KdDebugState & KD_DEBUG_GDB && BootPhase == 0) KdPortInitializeEx(&GdbPortInfo, 0, 0); @@ -260,7 +258,6 @@ if (KdDebugState & KD_DEBUG_MDA && BootPhase > 0) KdInitializeMda(); - } } @@ -292,8 +289,6 @@ KdInit3(VOID) { /* Print some information */ - if (KdDebuggerEnabled == TRUE) - { if (KdDebugState & KD_DEBUG_GDB) PrintString("\n GDB debugging enabled. COM%ld %ld Baud\n\n", GdbPortInfo.ComPort, GdbPortInfo.BaudRate); @@ -315,7 +310,6 @@ PrintString("\n File log debugging enabled\n\n"); if (KdDebugState & KD_DEBUG_MDA) PrintString("\n MDA debugging enabled\n\n"); - } } @@ -449,7 +443,7 @@ /* B - Bug check the system. */ else if (Code == 1) { - KEBUGCHECK(0xDEADDEAD); + KEBUGCHECK(MANUALLY_INITIATED_CRASH); } /* * C - Dump statistics about the distribution of tagged blocks in

19 years, 6 months

← Newer
1
...
32
33
34
35
36
37
38
...
61
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2005