Ros-diffs November 2008

ros-diffs@reactos.org

28 participants
657 discussions

[fireball] 37204: - Update wpp to Wine-20081105.

by fireball＠svn.reactos.org

Author: fireball Date: Wed Nov 5 15:47:55 2008 New Revision: 37204 URL: http://svn.reactos.org/svn/reactos?rev=37204&view=rev Log: - Update wpp to Wine-20081105. Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/tools/wpp/lex.yy.c trunk/reactos/tools/wpp/ppl.l trunk/reactos/tools/wpp/ppy.tab.c trunk/reactos/tools/wpp/ppy.tab.h trunk/reactos/tools/wpp/ppy.y trunk/reactos/tools/wpp/wpp.c trunk/reactos/tools/wpp/wpp_private.h Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Wed Nov 5 15:47:55 2008 @@ -22,7 +22,7 @@ The following build tools are shared with Wine. reactos/tools/unicode # Synced to Wine-20081105 (~Wine-1.1.7) -reactos/tools/wpp # Synced to Wine-0_9_5 +reactos/tools/wpp # Synced to Wine-20081105 (~Wine-1.1.7) reactos/tools/winebuild # Synced to Wine-20071217 reactos/tools/wmc # Synced to Wine-20071201 reactos/tools/wrc # Synced to Wine-0_9_53 Modified: trunk/reactos/tools/wpp/lex.yy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wpp/lex.yy.c?rev=372… ============================================================================== --- trunk/reactos/tools/wpp/lex.yy.c [iso-8859-1] (original) +++ trunk/reactos/tools/wpp/lex.yy.c [iso-8859-1] Wed Nov 5 15:47:55 2008 @@ -16,7 +16,7 @@ #define yytext ppy_text #define yywrap ppy_wrap -#line 20 "tools\\wpp_new\\lex.yy.c" +#line 20 "lex.yy.c" /* A lexical scanner generated by flex */ /* Scanner skeleton version: @@ -921,7 +921,7 @@ #define YY_MORE_ADJ 0 #define YY_RESTORE_YY_MORE_OFFSET char *yytext; -#line 1 "tools\\wpp_new\\ppl.l" +#line 1 "ppl.l" #define INITIAL 0 /* -*-C-*- * Wrc preprocessor lexical analysis @@ -1050,6 +1050,7 @@ */ #define YY_STACK_USED 1 #define YY_NEVER_INTERACTIVE 1 +#define YY_NO_INPUT 1 #define YY_NO_UNPUT 1 #define pp_pp 1 @@ -1093,13 +1094,28 @@ #define RCINCL 21 -#line 159 "tools\\wpp_new\\ppl.l" -#include <config.h> +#line 159 "ppl.l" +#include "config.h" +#include "wine/port.h" #include <stdio.h> #include <stdlib.h> #include <string.h> #include <ctype.h> #include <assert.h> +#include <errno.h> +#include <limits.h> + +#ifndef LLONG_MAX +# define LLONG_MAX ((long long)0x7fffffff << 32 | 0xffffffff) +# define LLONG_MIN (-LLONG_MAX - 1) +#endif +#ifndef ULLONG_MAX +# define ULLONG_MAX ((long long)0xffffffff << 32 | 0xffffffff) +#endif + +#ifndef HAVE_UNISTD_H +#define YY_NO_UNISTD_H +#endif #include "wpp_private.h" #include "ppy.tab.h" @@ -1138,7 +1154,6 @@ /* Include management */ include_state_t incl; char *include_filename; - int pass_data; } bufferstackentry_t; #define ALLOCBLOCKSIZE (1 << 10) /* Allocate these chunks at a time for string-buffers */ @@ -1171,7 +1186,6 @@ static void newline(int); static int make_number(int radix, YYSTYPE *val, const char *str, int len); static void put_buffer(const char *s, int len); -static int is_c_h_include(char *fname, int quoted); /* Buffer management */ static void push_buffer(pp_entry_t *ppp, char *filename, char *incname, int pop); static bufferstackentry_t *pop_buffer(void); @@ -1210,8 +1224,6 @@ static bufferstackentry_t bufferstack[MAXBUFFERSTACK]; static int bufferstackidx = 0; -static int pass_data=1; - /* * Global variables */ @@ -1230,7 +1242,7 @@ * The scanner starts here ************************************************************************** */ -#line 1234 "tools\\wpp_new\\lex.yy.c" +#line 1246 "lex.yy.c" /* Macros after this point can all be overridden by user definitions in * section 1. @@ -1384,7 +1396,7 @@ register char *yy_cp, *yy_bp; register int yy_act; -#line 298 "tools\\wpp_new\\ppl.l" +#line 309 "ppl.l" /* * Catch line-continuations. @@ -1398,7 +1410,7 @@ /* * Detect the leading # of a preprocessor directive. */ -#line 1402 "tools\\wpp_new\\lex.yy.c" +#line 1414 "lex.yy.c" if ( yy_init ) { @@ -1484,7 +1496,7 @@ case 1: YY_RULE_SETUP -#line 311 "tools\\wpp_new\\ppl.l" +#line 322 "ppl.l" pp_incl_state.seen_junk++; yy_push_state(pp_pp); YY_BREAK /* @@ -1492,102 +1504,102 @@ */ case 2: YY_RULE_SETUP -#line 316 "tools\\wpp_new\\ppl.l" +#line 327 "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 317 "tools\\wpp_new\\ppl.l" +#line 328 "ppl.l" yy_pp_state(yy_current_state() != pp_ignore ? pp_def : pp_eol); YY_BREAK case 4: YY_RULE_SETUP -#line 318 "tools\\wpp_new\\ppl.l" +#line 329 "ppl.l" yy_pp_state(pp_eol); if(yy_top_state() != pp_ignore) return tERROR; YY_BREAK case 5: YY_RULE_SETUP -#line 319 "tools\\wpp_new\\ppl.l" +#line 330 "ppl.l" yy_pp_state(pp_eol); if(yy_top_state() != pp_ignore) return tWARNING; YY_BREAK case 6: YY_RULE_SETUP -#line 320 "tools\\wpp_new\\ppl.l" +#line 331 "ppl.l" yy_pp_state(pp_eol); if(yy_top_state() != pp_ignore) return tPRAGMA; YY_BREAK case 7: YY_RULE_SETUP -#line 321 "tools\\wpp_new\\ppl.l" +#line 332 "ppl.l" yy_pp_state(pp_eol); if(yy_top_state() != pp_ignore) return tPPIDENT; YY_BREAK case 8: YY_RULE_SETUP -#line 322 "tools\\wpp_new\\ppl.l" +#line 333 "ppl.l" if(yy_top_state() != pp_ignore) {yy_pp_state(pp_ifd); return tUNDEF;} else {yy_pp_state(pp_eol);} YY_BREAK case 9: YY_RULE_SETUP -#line 323 "tools\\wpp_new\\ppl.l" +#line 334 "ppl.l" yy_pp_state(pp_ifd); return tIFDEF; YY_BREAK case 10: YY_RULE_SETUP -#line 324 "tools\\wpp_new\\ppl.l" +#line 335 "ppl.l" pp_incl_state.seen_junk--; yy_pp_state(pp_ifd); return tIFNDEF; YY_BREAK case 11: YY_RULE_SETUP -#line 325 "tools\\wpp_new\\ppl.l" +#line 336 "ppl.l" yy_pp_state(pp_if); return tIF; YY_BREAK case 12: YY_RULE_SETUP -#line 326 "tools\\wpp_new\\ppl.l" +#line 337 "ppl.l" yy_pp_state(pp_if); return tELIF; YY_BREAK case 13: YY_RULE_SETUP -#line 327 "tools\\wpp_new\\ppl.l" +#line 338 "ppl.l" yy_pp_state(pp_endif); return tELSE; YY_BREAK case 14: YY_RULE_SETUP -#line 328 "tools\\wpp_new\\ppl.l" +#line 339 "ppl.l" yy_pp_state(pp_endif); return tENDIF; YY_BREAK case 15: YY_RULE_SETUP -#line 329 "tools\\wpp_new\\ppl.l" +#line 340 "ppl.l" if(yy_top_state() != pp_ignore) {yy_pp_state(pp_line); return tLINE;} else {yy_pp_state(pp_eol);} YY_BREAK case 16: YY_RULE_SETUP -#line 330 "tools\\wpp_new\\ppl.l" +#line 341 "ppl.l" if(yy_top_state() != pp_ignore) {yy_pp_state(pp_line); return tGCCLINE;} else {yy_pp_state(pp_eol);} YY_BREAK case 17: YY_RULE_SETUP -#line 331 "tools\\wpp_new\\ppl.l" +#line 342 "ppl.l" ppy_error("Invalid preprocessor token '%s'", ppy_text); YY_BREAK case 18: YY_RULE_SETUP -#line 332 "tools\\wpp_new\\ppl.l" +#line 343 "ppl.l" newline(1); yy_pop_state(); return tNL; /* This could be the null-token */ YY_BREAK case 19: YY_RULE_SETUP -#line 333 "tools\\wpp_new\\ppl.l" +#line 344 "ppl.l" newline(0); YY_BREAK case 20: YY_RULE_SETUP -#line 334 "tools\\wpp_new\\ppl.l" +#line 345 "ppl.l" ppy_error("Preprocessor junk '%s'", ppy_text); YY_BREAK case 21: YY_RULE_SETUP -#line 335 "tools\\wpp_new\\ppl.l" +#line 346 "ppl.l" return *ppy_text; YY_BREAK /* @@ -1595,37 +1607,37 @@ */ case 22: YY_RULE_SETUP -#line 340 "tools\\wpp_new\\ppl.l" +#line 351 "ppl.l" return make_number(10, &ppy_lval, ppy_text, ppy_leng); YY_BREAK case 23: YY_RULE_SETUP -#line 341 "tools\\wpp_new\\ppl.l" +#line 352 "ppl.l" new_string(); add_string(ppy_text, ppy_leng); yy_push_state(pp_iqs); YY_BREAK case 24: YY_RULE_SETUP -#line 342 "tools\\wpp_new\\ppl.l" +#line 353 "ppl.l" new_string(); add_string(ppy_text, ppy_leng); yy_push_state(pp_dqs); YY_BREAK case 25: YY_RULE_SETUP -#line 343 "tools\\wpp_new\\ppl.l" +#line 354 "ppl.l" ; YY_BREAK case 26: YY_RULE_SETUP -#line 344 "tools\\wpp_new\\ppl.l" +#line 355 "ppl.l" newline(1); yy_pop_state(); return tNL; YY_BREAK case 27: YY_RULE_SETUP -#line 345 "tools\\wpp_new\\ppl.l" +#line 356 "ppl.l" newline(0); YY_BREAK case 28: YY_RULE_SETUP -#line 346 "tools\\wpp_new\\ppl.l" +#line 357 "ppl.l" ppy_error(yy_current_state() == pp_inc ? "Trailing junk in #include" : "Trailing junk in #line"); YY_BREAK /* @@ -1633,22 +1645,22 @@ */ case 29: YY_RULE_SETUP -#line 351 "tools\\wpp_new\\ppl.l" +#line 362 "ppl.l" ; YY_BREAK case 30: YY_RULE_SETUP -#line 352 "tools\\wpp_new\\ppl.l" +#line 363 "ppl.l" newline(1); YY_BREAK case 31: YY_RULE_SETUP -#line 353 "tools\\wpp_new\\ppl.l" +#line 364 "ppl.l" newline(0); YY_BREAK case 32: YY_RULE_SETUP -#line 354 "tools\\wpp_new\\ppl.l" +#line 365 "ppl.l" ; YY_BREAK /* @@ -1659,107 +1671,107 @@ */ case 33: YY_RULE_SETUP -#line 363 "tools\\wpp_new\\ppl.l" +#line 374 "ppl.l" return make_number(8, &ppy_lval, ppy_text, ppy_leng); YY_BREAK case 34: YY_RULE_SETUP -#line 364 "tools\\wpp_new\\ppl.l" +#line 375 "ppl.l" ppy_error("Invalid octal digit"); YY_BREAK case 35: YY_RULE_SETUP -#line 365 "tools\\wpp_new\\ppl.l" +#line 376 "ppl.l" return make_number(10, &ppy_lval, ppy_text, ppy_leng); YY_BREAK case 36: YY_RULE_SETUP -#line 366 "tools\\wpp_new\\ppl.l" +#line 377 "ppl.l" return make_number(16, &ppy_lval, ppy_text, ppy_leng); YY_BREAK case 37: YY_RULE_SETUP -#line 367 "tools\\wpp_new\\ppl.l" +#line 378 "ppl.l" ppy_error("Invalid hex number"); YY_BREAK case 38: YY_RULE_SETUP -#line 368 "tools\\wpp_new\\ppl.l" +#line 379 "ppl.l" yy_push_state(pp_defined); return tDEFINED; YY_BREAK case 39: YY_RULE_SETUP -#line 369 "tools\\wpp_new\\ppl.l" +#line 380 "ppl.l" return tLSHIFT; YY_BREAK case 40: YY_RULE_SETUP -#line 370 "tools\\wpp_new\\ppl.l" +#line 381 "ppl.l" return tRSHIFT; YY_BREAK case 41: YY_RULE_SETUP -#line 371 "tools\\wpp_new\\ppl.l" +#line 382 "ppl.l" return tLOGAND; YY_BREAK case 42: YY_RULE_SETUP -#line 372 "tools\\wpp_new\\ppl.l" +#line 383 "ppl.l" return tLOGOR; YY_BREAK case 43: YY_RULE_SETUP -#line 373 "tools\\wpp_new\\ppl.l" +#line 384 "ppl.l" return tEQ; YY_BREAK case 44: YY_RULE_SETUP -#line 374 "tools\\wpp_new\\ppl.l" +#line 385 "ppl.l" return tNE; YY_BREAK case 45: YY_RULE_SETUP -#line 375 "tools\\wpp_new\\ppl.l" +#line 386 "ppl.l" return tLTE; YY_BREAK case 46: YY_RULE_SETUP -#line 376 "tools\\wpp_new\\ppl.l" +#line 387 "ppl.l" return tGTE; YY_BREAK case 47: YY_RULE_SETUP -#line 377 "tools\\wpp_new\\ppl.l" +#line 388 "ppl.l" newline(1); yy_pop_state(); return tNL; YY_BREAK case 48: YY_RULE_SETUP -#line 378 "tools\\wpp_new\\ppl.l" +#line 389 "ppl.l" newline(0); YY_BREAK case 49: YY_RULE_SETUP -#line 379 "tools\\wpp_new\\ppl.l" +#line 390 "ppl.l" ppy_error("Junk in conditional expression"); YY_BREAK case 50: YY_RULE_SETUP -#line 380 "tools\\wpp_new\\ppl.l" +#line 391 "ppl.l" ; YY_BREAK case 51: YY_RULE_SETUP -#line 381 "tools\\wpp_new\\ppl.l" +#line 392 "ppl.l" new_string(); add_string(ppy_text, ppy_leng); yy_push_state(pp_sqs); YY_BREAK case 52: YY_RULE_SETUP -#line 382 "tools\\wpp_new\\ppl.l" +#line 393 "ppl.l" ppy_error("String constants not allowed in conditionals"); YY_BREAK case 53: YY_RULE_SETUP -#line 383 "tools\\wpp_new\\ppl.l" +#line 394 "ppl.l" return *ppy_text; YY_BREAK /* @@ -1768,27 +1780,27 @@ */ case 54: YY_RULE_SETUP -#line 389 "tools\\wpp_new\\ppl.l" +#line 400 "ppl.l" ppy_lval.cptr = pp_xstrdup(ppy_text); return tIDENT; YY_BREAK case 55: YY_RULE_SETUP -#line 390 "tools\\wpp_new\\ppl.l" +#line 401 "ppl.l" ; YY_BREAK case 56: YY_RULE_SETUP -#line 391 "tools\\wpp_new\\ppl.l" +#line 402 "ppl.l" newline(1); yy_pop_state(); return tNL; YY_BREAK case 57: YY_RULE_SETUP -#line 392 "tools\\wpp_new\\ppl.l" +#line 403 "ppl.l" newline(0); YY_BREAK case 58: YY_RULE_SETUP -#line 393 "tools\\wpp_new\\ppl.l" +#line 404 "ppl.l" ppy_error("Identifier expected"); YY_BREAK /* @@ -1796,22 +1808,22 @@ */ case 59: YY_RULE_SETUP -#line 398 "tools\\wpp_new\\ppl.l" +#line 409 "ppl.l" ; YY_BREAK case 60: YY_RULE_SETUP -#line 399 "tools\\wpp_new\\ppl.l" +#line 410 "ppl.l" newline(1); yy_pop_state(); return tNL; YY_BREAK case 61: YY_RULE_SETUP -#line 400 "tools\\wpp_new\\ppl.l" +#line 411 "ppl.l" newline(0); YY_BREAK case 62: YY_RULE_SETUP -#line 401 "tools\\wpp_new\\ppl.l" +#line 412 "ppl.l" ppy_error("Garbage after #else or #endif."); YY_BREAK /* @@ -1821,27 +1833,27 @@ */ case 63: YY_RULE_SETUP -#line 408 "tools\\wpp_new\\ppl.l" +#line 419 "ppl.l" yy_pop_state(); ppy_lval.cptr = pp_xstrdup(ppy_text); return tIDENT; YY_BREAK case 64: YY_RULE_SETUP -#line 409 "tools\\wpp_new\\ppl.l" +#line 420 "ppl.l" ; YY_BREAK case 65: YY_RULE_SETUP -#line 410 "tools\\wpp_new\\ppl.l" +#line 421 "ppl.l" return *ppy_text; YY_BREAK case 66: YY_RULE_SETUP -#line 411 "tools\\wpp_new\\ppl.l" +#line 422 "ppl.l" newline(0); YY_BREAK case 67: YY_RULE_SETUP -#line 412 "tools\\wpp_new\\ppl.l" +#line 423 "ppl.l" ppy_error("Identifier expected"); YY_BREAK /* @@ -1852,27 +1864,27 @@ */ case 68: YY_RULE_SETUP -#line 420 "tools\\wpp_new\\ppl.l" +#line 431 "ppl.l" if(yy_top_state() != pp_ignore) { ppy_lval.cptr = pp_xstrdup(ppy_text); return tLITERAL; } YY_BREAK case 69: YY_RULE_SETUP -#line 421 "tools\\wpp_new\\ppl.l" +#line 432 "ppl.l" if(yy_top_state() != pp_ignore) { ppy_lval.cptr = pp_xstrdup(ppy_text); return tLITERAL; } YY_BREAK case 70: YY_RULE_SETUP -#line 422 "tools\\wpp_new\\ppl.l" +#line 433 "ppl.l" if(yy_top_state() != pp_ignore) { ppy_lval.cptr = pp_xstrdup(ppy_text); return tLITERAL; } YY_BREAK case 71: YY_RULE_SETUP -#line 423 "tools\\wpp_new\\ppl.l" +#line 434 "ppl.l" newline(1); yy_pop_state(); if(yy_current_state() != pp_ignore) { return tNL; } YY_BREAK case 72: YY_RULE_SETUP -#line 424 "tools\\wpp_new\\ppl.l" +#line 435 "ppl.l" newline(0); YY_BREAK /* @@ -1880,27 +1892,27 @@ */ case 73: YY_RULE_SETUP -#line 429 "tools\\wpp_new\\ppl.l" +#line 440 "ppl.l" ppy_lval.cptr = pp_xstrdup(ppy_text); ppy_lval.cptr[ppy_leng-1] = '\0'; yy_pp_state(pp_macro); return tMACRO; YY_BREAK case 74: YY_RULE_SETUP -#line 430 "tools\\wpp_new\\ppl.l" +#line 441 "ppl.l" ppy_lval.cptr = pp_xstrdup(ppy_text); yy_pp_state(pp_define); return tDEFINE; YY_BREAK case 75: YY_RULE_SETUP -#line 431 "tools\\wpp_new\\ppl.l" +#line 442 "ppl.l" ; YY_BREAK case 76: YY_RULE_SETUP -#line 432 "tools\\wpp_new\\ppl.l" +#line 443 "ppl.l" newline(0); YY_BREAK case 77: YY_RULE_SETUP -#line 433 "tools\\wpp_new\\ppl.l" +#line 444 "ppl.l" perror("Identifier expected"); YY_BREAK /* @@ -1908,37 +1920,37 @@ */ case 78: YY_RULE_SETUP -#line 438 "tools\\wpp_new\\ppl.l" +#line 449 "ppl.l" ppy_lval.cptr = pp_xstrdup(ppy_text); return tLITERAL; YY_BREAK case 79: YY_RULE_SETUP -#line 439 "tools\\wpp_new\\ppl.l" +#line 450 "ppl.l" ppy_lval.cptr = pp_xstrdup(ppy_text); return tLITERAL; YY_BREAK case 80: YY_RULE_SETUP -#line 440 "tools\\wpp_new\\ppl.l" +#line 451 "ppl.l" newline(0); ppy_lval.cptr = pp_xstrdup(" "); return tLITERAL; YY_BREAK case 81: YY_RULE_SETUP -#line 441 "tools\\wpp_new\\ppl.l" +#line 452 "ppl.l" newline(0); YY_BREAK case 82: YY_RULE_SETUP -#line 442 "tools\\wpp_new\\ppl.l" +#line 453 "ppl.l" newline(1); yy_pop_state(); return tNL; YY_BREAK case 83: YY_RULE_SETUP -#line 443 "tools\\wpp_new\\ppl.l" +#line 454 "ppl.l" new_string(); add_string(ppy_text, ppy_leng); yy_push_state(pp_sqs); YY_BREAK case 84: YY_RULE_SETUP -#line 444 "tools\\wpp_new\\ppl.l" +#line 455 "ppl.l" new_string(); add_string(ppy_text, ppy_leng); yy_push_state(pp_dqs); YY_BREAK /* @@ -1946,37 +1958,37 @@ */ case 85: YY_RULE_SETUP -#line 449 "tools\\wpp_new\\ppl.l" +#line 460 "ppl.l" yy_pp_state(pp_mbody); return tMACROEND; YY_BREAK case 86: YY_RULE_SETUP -#line 450 "tools\\wpp_new\\ppl.l" +#line 461 "ppl.l" ; YY_BREAK case 87: YY_RULE_SETUP -#line 451 "tools\\wpp_new\\ppl.l" +#line 462 "ppl.l" ppy_lval.cptr = pp_xstrdup(ppy_text); return tIDENT; YY_BREAK case 88: YY_RULE_SETUP -#line 452 "tools\\wpp_new\\ppl.l" +#line 463 "ppl.l" return ','; YY_BREAK case 89: YY_RULE_SETUP -#line 453 "tools\\wpp_new\\ppl.l" +#line 464 "ppl.l" return tELIPSIS; YY_BREAK case 90: YY_RULE_SETUP -#line 454 "tools\\wpp_new\\ppl.l" +#line 465 "ppl.l" ppy_error("Argument identifier expected"); YY_BREAK case 91: YY_RULE_SETUP -#line 455 "tools\\wpp_new\\ppl.l" +#line 466 "ppl.l" newline(0); YY_BREAK /* @@ -1984,57 +1996,57 @@ */ case 92: YY_RULE_SETUP -#line 460 "tools\\wpp_new\\ppl.l" +#line 471 "ppl.l" ppy_lval.cptr = pp_xstrdup(ppy_text); return tLITERAL; YY_BREAK case 93: YY_RULE_SETUP -#line 461 "tools\\wpp_new\\ppl.l" +#line 472 "ppl.l" ppy_lval.cptr = pp_xstrdup(ppy_text); return tIDENT; YY_BREAK case 94: YY_RULE_SETUP -#line 462 "tools\\wpp_new\\ppl.l" +#line 473 "ppl.l" return tCONCAT; YY_BREAK case 95: YY_RULE_SETUP -#line 463 "tools\\wpp_new\\ppl.l" +#line 474 "ppl.l" return tSTRINGIZE; YY_BREAK case 96: YY_RULE_SETUP -#line 464 "tools\\wpp_new\\ppl.l" +#line 475 "ppl.l" ppy_lval.cptr = pp_xstrdup(ppy_text); return tLITERAL; YY_BREAK case 97: YY_RULE_SETUP -#line 465 "tools\\wpp_new\\ppl.l" +#line 476 "ppl.l" ppy_lval.cptr = pp_xstrdup(ppy_text); return tLITERAL; YY_BREAK case 98: YY_RULE_SETUP -#line 466 "tools\\wpp_new\\ppl.l" +#line 477 "ppl.l" newline(0); ppy_lval.cptr = pp_xstrdup(" "); return tLITERAL; YY_BREAK case 99: YY_RULE_SETUP -#line 467 "tools\\wpp_new\\ppl.l" +#line 478 "ppl.l" newline(0); YY_BREAK case 100: YY_RULE_SETUP -#line 468 "tools\\wpp_new\\ppl.l" +#line 479 "ppl.l" newline(1); yy_pop_state(); return tNL; YY_BREAK case 101: YY_RULE_SETUP -#line 469 "tools\\wpp_new\\ppl.l" +#line 480 "ppl.l" new_string(); add_string(ppy_text, ppy_leng); yy_push_state(pp_sqs); YY_BREAK case 102: YY_RULE_SETUP -#line 470 "tools\\wpp_new\\ppl.l" +#line 481 "ppl.l" new_string(); add_string(ppy_text, ppy_leng); yy_push_state(pp_dqs); YY_BREAK /* @@ -2051,12 +2063,12 @@ yy_c_buf_p = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 481 "tools\\wpp_new\\ppl.l" +#line 492 "ppl.l" yy_pp_state(pp_macscan); YY_BREAK case 104: YY_RULE_SETUP -#line 482 "tools\\wpp_new\\ppl.l" +#line 493 "ppl.l" { if(yy_top_state() != pp_macscan) newline(0); @@ -2064,12 +2076,12 @@ YY_BREAK case 105: YY_RULE_SETUP -#line 486 "tools\\wpp_new\\ppl.l" +#line 497 "ppl.l" newline(0); YY_BREAK case 106: YY_RULE_SETUP -#line 487 "tools\\wpp_new\\ppl.l" +#line 498 "ppl.l" { macexpstackentry_t *mac = pop_macro(); yy_pop_state(); @@ -2084,7 +2096,7 @@ */ case 107: YY_RULE_SETUP -#line 499 "tools\\wpp_new\\ppl.l" +#line 510 "ppl.l" { if(++MACROPARENTHESES() > 1) add_text_to_macro(ppy_text, ppy_leng); @@ -2092,7 +2104,7 @@ YY_BREAK case 108: YY_RULE_SETUP -#line 503 "tools\\wpp_new\\ppl.l" +#line 514 "ppl.l" { if(--MACROPARENTHESES() == 0) { @@ -2105,7 +2117,7 @@ YY_BREAK case 109: YY_RULE_SETUP -#line 512 "tools\\wpp_new\\ppl.l" +#line 523 "ppl.l" { if(MACROPARENTHESES() > 1) add_text_to_macro(ppy_text, ppy_leng); @@ -2115,32 +2127,32 @@ YY_BREAK case 110: YY_RULE_SETUP -#line 518 "tools\\wpp_new\\ppl.l" +#line 529 "ppl.l" new_string(); add_string(ppy_text, ppy_leng); yy_push_state(pp_dqs); YY_BREAK case 111: YY_RULE_SETUP -#line 519 "tools\\wpp_new\\ppl.l" +#line 530 "ppl.l" new_string(); add_string(ppy_text, ppy_leng); yy_push_state(pp_sqs); YY_BREAK case 112: YY_RULE_SETUP -#line 520 "tools\\wpp_new\\ppl.l" +#line 531 "ppl.l" yy_push_state(pp_comment); add_text_to_macro(" ", 1); YY_BREAK case 113: YY_RULE_SETUP -#line 521 "tools\\wpp_new\\ppl.l" +#line 532 "ppl.l" pp_status.line_number++; pp_status.char_number = 1; add_text_to_macro(ppy_text, ppy_leng); YY_BREAK case 114: YY_RULE_SETUP -#line 522 "tools\\wpp_new\\ppl.l" +#line 533 "ppl.l" add_text_to_macro(ppy_text, ppy_leng); YY_BREAK case 115: YY_RULE_SETUP -#line 523 "tools\\wpp_new\\ppl.l" +#line 534 "ppl.l" newline(0); YY_BREAK /* @@ -2148,22 +2160,22 @@ */ case 116: YY_RULE_SETUP -#line 528 "tools\\wpp_new\\ppl.l" +#line 539 "ppl.l" yy_push_state(pp_comment); YY_BREAK case 117: YY_RULE_SETUP -#line 529 "tools\\wpp_new\\ppl.l" +#line 540 "ppl.l" ; YY_BREAK case 118: YY_RULE_SETUP -#line 530 "tools\\wpp_new\\ppl.l" +#line 541 "ppl.l" newline(0); YY_BREAK case 119: YY_RULE_SETUP -#line 531 "tools\\wpp_new\\ppl.l" +#line 542 "ppl.l" yy_pop_state(); YY_BREAK /* @@ -2171,7 +2183,7 @@ */ case 120: YY_RULE_SETUP -#line 536 "tools\\wpp_new\\ppl.l" +#line 547 "ppl.l" { if(ppy_text[ppy_leng-1] == '\\') ppy_warning("C++ style comment ends with an escaped newline (escape ignored)"); @@ -2182,22 +2194,22 @@ */ case 121: YY_RULE_SETUP -#line 544 "tools\\wpp_new\\ppl.l" +#line 555 "ppl.l" pp_incl_state.seen_junk++; new_string(); add_string(ppy_text, ppy_leng); yy_push_state(pp_dqs); YY_BREAK case 122: YY_RULE_SETUP -#line 545 "tools\\wpp_new\\ppl.l" +#line 556 "ppl.l" pp_incl_state.seen_junk++; new_string(); add_string(ppy_text, ppy_leng); yy_push_state(pp_sqs); YY_BREAK case 123: YY_RULE_SETUP -#line 546 "tools\\wpp_new\\ppl.l" +#line 557 "ppl.l" add_string(ppy_text, ppy_leng); YY_BREAK case 124: YY_RULE_SETUP -#line 547 "tools\\wpp_new\\ppl.l" +#line 558 "ppl.l" { add_string(ppy_text, ppy_leng); yy_pop_state(); @@ -2213,8 +2225,6 @@ return tDQSTRING; case pp_line: ppy_lval.cptr = get_string(); - if (is_c_h_include(ppy_lval.cptr, 1)) pass_data=0; - else pass_data=1; return tDQSTRING; default: put_string(); @@ -2223,12 +2233,12 @@ YY_BREAK case 125: YY_RULE_SETUP -#line 569 "tools\\wpp_new\\ppl.l" +#line 578 "ppl.l" add_string(ppy_text, ppy_leng); YY_BREAK case 126: YY_RULE_SETUP -#line 570 "tools\\wpp_new\\ppl.l" +#line 579 "ppl.l" { add_string(ppy_text, ppy_leng); yy_pop_state(); @@ -2246,12 +2256,12 @@ YY_BREAK case 127: YY_RULE_SETUP -#line 584 "tools\\wpp_new\\ppl.l" +#line 593 "ppl.l" add_string(ppy_text, ppy_leng); YY_BREAK case 128: YY_RULE_SETUP -#line 585 "tools\\wpp_new\\ppl.l" +#line 594 "ppl.l" { add_string(ppy_text, ppy_leng); yy_pop_state(); @@ -2261,7 +2271,7 @@ YY_BREAK case 129: YY_RULE_SETUP -#line 591 "tools\\wpp_new\\ppl.l" +#line 600 "ppl.l" { /* * This is tricky; we need to remove the line-continuation @@ -2289,12 +2299,12 @@ YY_BREAK case 130: YY_RULE_SETUP -#line 615 "tools\\wpp_new\\ppl.l" +#line 624 "ppl.l" add_string(ppy_text, ppy_leng); YY_BREAK case 131: YY_RULE_SETUP -#line 616 "tools\\wpp_new\\ppl.l" +#line 625 "ppl.l" { newline(1); add_string(ppy_text, ppy_leng); @@ -2306,7 +2316,7 @@ */ case 132: YY_RULE_SETUP -#line 625 "tools\\wpp_new\\ppl.l" +#line 634 "ppl.l" { pp_entry_t *ppp; pp_incl_state.seen_junk++; @@ -2355,27 +2365,27 @@ */ case 133: YY_RULE_SETUP -#line 671 "tools\\wpp_new\\ppl.l" +#line 680 "ppl.l" pp_incl_state.seen_junk++; put_buffer(ppy_text, ppy_leng); YY_BREAK case 134: YY_RULE_SETUP -#line 672 "tools\\wpp_new\\ppl.l" +#line 681 "ppl.l" put_buffer(ppy_text, ppy_leng); YY_BREAK case 135: YY_RULE_SETUP -#line 673 "tools\\wpp_new\\ppl.l" +#line 682 "ppl.l" newline(1); YY_BREAK case 136: YY_RULE_SETUP -#line 674 "tools\\wpp_new\\ppl.l" +#line 683 "ppl.l" newline(0); YY_BREAK case 137: YY_RULE_SETUP -#line 675 "tools\\wpp_new\\ppl.l" +#line 684 "ppl.l" pp_incl_state.seen_junk++; put_buffer(ppy_text, ppy_leng); YY_BREAK /* @@ -2384,12 +2394,12 @@ */ case 138: YY_RULE_SETUP -#line 681 "tools\\wpp_new\\ppl.l" +#line 690 "ppl.l" put_buffer(ppy_text, ppy_leng); YY_BREAK case 139: YY_RULE_SETUP -#line 683 "tools\\wpp_new\\ppl.l" +#line 692 "ppl.l" { ppy_lval.cptr=pp_xstrdup(ppy_text); yy_pop_state(); @@ -2398,12 +2408,12 @@ YY_BREAK case 140: YY_RULE_SETUP -#line 689 "tools\\wpp_new\\ppl.l" +#line 698 "ppl.l" ; YY_BREAK case 141: YY_RULE_SETUP -#line 691 "tools\\wpp_new\\ppl.l" +#line 700 "ppl.l" { new_string(); add_string(ppy_text,ppy_leng);yy_push_state(pp_dqs); } @@ -2414,7 +2424,7 @@ */ case 142: YY_RULE_SETUP -#line 699 "tools\\wpp_new\\ppl.l" +#line 708 "ppl.l" pp_incl_state.seen_junk++; ppy_warning("Unmatched text '%c' (0x%02x); please report\n", isprint(*ppy_text & 0xff) ? *ppy_text : ' ', *ppy_text); YY_BREAK case YY_STATE_EOF(INITIAL): @@ -2439,7 +2449,7 @@ case YY_STATE_EOF(pp_defined): case YY_STATE_EOF(pp_ignore): case YY_STATE_EOF(RCINCL): -#line 701 "tools\\wpp_new\\ppl.l" +#line 710 "ppl.l" { YY_BUFFER_STATE b = YY_CURRENT_BUFFER; bufferstackentry_t *bep = pop_buffer(); @@ -2464,10 +2474,10 @@ YY_BREAK case 143: YY_RULE_SETUP -#line 723 "tools\\wpp_new\\ppl.l" +#line 732 "ppl.l" ECHO; YY_BREAK -#line 2471 "tools\\wpp_new\\lex.yy.c" +#line 2481 "lex.yy.c" case YY_END_OF_BUFFER: { @@ -3353,7 +3363,7 @@ return 0; } #endif -#line 723 "tools\\wpp_new\\ppl.l" +#line 732 "ppl.l" /* ************************************************************************** @@ -3425,6 +3435,7 @@ int is_ll = 0; int is_u = 0; char ext[4]; + long l; ext[3] = '\0'; ext[2] = toupper(str[len-1]); @@ -3462,12 +3473,18 @@ #ifdef HAVE_LONG_LONG if (is_u) { + errno = 0; val->ull = strtoull(str, NULL, radix); + if (val->ull == ULLONG_MAX && errno == ERANGE) + ppy_error("integer constant %s is too large\n", str); return tULONGLONG; } else { + errno = 0; val->sll = strtoll(str, NULL, radix); + if ((val->sll == LLONG_MIN || val->sll == LLONG_MAX) && errno == ERANGE) + ppy_error("integer constant %s is too large\n", str); return tSLONGLONG; } #else @@ -3476,22 +3493,38 @@ } else if(is_u && is_l) { + errno = 0; val->ulong = strtoul(str, NULL, radix); + if (val->ulong == ULONG_MAX && errno == ERANGE) + ppy_error("integer constant %s is too large\n", str); return tULONG; } else if(!is_u && is_l) { + errno = 0; val->slong = strtol(str, NULL, radix); + if ((val->slong == LONG_MIN || val->slong == LONG_MAX) && errno == ERANGE) + ppy_error("integer constant %s is too large\n", str); return tSLONG; } else if(is_u && !is_l) { - val->uint = (unsigned int)strtoul(str, NULL, radix); + unsigned long ul; + errno = 0; + ul = strtoul(str, NULL, radix); + if ((ul == ULONG_MAX && errno == ERANGE) || (ul > UINT_MAX)) + ppy_error("integer constant %s is too large\n", str); + val->uint = (unsigned int)ul; return tUINT; } /* Else it must be an int... */ - val->sint = (int)strtol(str, NULL, radix); + errno = 0; + l = strtol(str, NULL, radix); + if (((l == LONG_MIN || l == LONG_MAX) && errno == ERANGE) || + (l > INT_MAX) || (l < INT_MIN)) + ppy_error("integer constant %s is too large\n", str); + val->sint = (int)l; return tSINT; } @@ -3825,7 +3858,6 @@ bufferstack[bufferstackidx].ncontinuations = ncontinuations; bufferstack[bufferstackidx].incl = pp_incl_state; bufferstack[bufferstackidx].include_filename = incname; - bufferstack[bufferstackidx].pass_data = pass_data; if(ppp) ppp->expanding = 1; @@ -3888,7 +3920,6 @@ } free(pp_incl_state.ppp); pp_incl_state = bufferstack[bufferstackidx].incl; - pass_data = bufferstack[bufferstackidx].pass_data; } } @@ -4044,10 +4075,8 @@ { if(top_macro()) add_text_to_macro(s, len); - else { - if(pass_data) + else fwrite(s, 1, len, ppy_out); - } } @@ -4056,15 +4085,6 @@ * Include management *------------------------------------------------------------------------- */ -static int is_c_h_include(char *fname, int quoted) -{ - int sl=strlen(fname); - if (sl < 2 + 2 * quoted) return 0; - if ((toupper(fname[sl-1-quoted])!='H') && (toupper(fname[sl-1-quoted])!='C')) return 0; - if (fname[sl-2-quoted]!='.') return 0; - return 1; -} - void pp_do_include(char *fname, int type) { char *newpath; @@ -4100,12 +4120,10 @@ pp_incl_state.seen_junk = 0; pp_incl_state.state = 0; pp_incl_state.ppp = NULL; - if (is_c_h_include(newpath, 0)) pass_data=0; - else pass_data=1; if(pp_status.debug) - fprintf(stderr, "pp_do_include: %s:%d: include_state=%d, include_ppp='%s', include_ifdepth=%d ,pass_data=%d\n", - pp_status.input, pp_status.line_number, pp_incl_state.state, pp_incl_state.ppp, pp_incl_state.ifdepth, pass_data); + fprintf(stderr, "pp_do_include: %s:%d: include_state=%d, include_ppp='%s', include_ifdepth=%d\n", + pp_status.input, pp_status.line_number, pp_incl_state.state, pp_incl_state.ppp, pp_incl_state.ifdepth); ppy__switch_to_buffer(ppy__create_buffer(ppy_in, YY_BUF_SIZE)); fprintf(ppy_out, "# 1 \"%s\" 1%s\n", newpath, type ? "" : " 3"); Modified: trunk/reactos/tools/wpp/ppl.l URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wpp/ppl.l?rev=37204&… ============================================================================== --- trunk/reactos/tools/wpp/ppl.l [iso-8859-1] (original) +++ trunk/reactos/tools/wpp/ppl.l [iso-8859-1] Wed Nov 5 15:47:55 2008 @@ -126,7 +126,7 @@ */ %option stack %option 8bit never-interactive -%option nounput +%option noinput nounput %option prefix="ppy_" %x pp_pp @@ -156,12 +156,27 @@ ul [uUlL]|[uUlL][lL]|[lL][uU]|[lL][lL][uU]|[uU][lL][lL]|[lL][uU][lL] %{ -#include <config.h> +#include "config.h" +#include "wine/port.h" #include <stdio.h> #include <stdlib.h> #include <string.h> #include <ctype.h> #include <assert.h> +#include <errno.h> +#include <limits.h> + +#ifndef LLONG_MAX +# define LLONG_MAX ((long long)0x7fffffff << 32 | 0xffffffff) +# define LLONG_MIN (-LLONG_MAX - 1) +#endif +#ifndef ULLONG_MAX +# define ULLONG_MAX ((long long)0xffffffff << 32 | 0xffffffff) +#endif + +#ifndef HAVE_UNISTD_H +#define YY_NO_UNISTD_H +#endif #include "wpp_private.h" #include "ppy.tab.h" @@ -200,7 +215,6 @@ /* Include management */ include_state_t incl; char *include_filename; - int pass_data; } bufferstackentry_t; #define ALLOCBLOCKSIZE (1 << 10) /* Allocate these chunks at a time for string-buffers */ @@ -233,7 +247,6 @@ static void newline(int); static int make_number(int radix, YYSTYPE *val, const char *str, int len); static void put_buffer(const char *s, int len); -static int is_c_h_include(char *fname, int quoted); /* Buffer management */ static void push_buffer(pp_entry_t *ppp, char *filename, char *incname, int pop); static bufferstackentry_t *pop_buffer(void); @@ -272,8 +285,6 @@ static bufferstackentry_t bufferstack[MAXBUFFERSTACK]; static int bufferstackidx = 0; -static int pass_data=1; - /* * Global variables */ @@ -559,8 +570,6 @@ return tDQSTRING; case pp_line: ppy_lval.cptr = get_string(); - if (is_c_h_include(ppy_lval.cptr, 1)) pass_data=0; - else pass_data=1; return tDQSTRING; default: put_string(); @@ -791,6 +800,7 @@ int is_ll = 0; int is_u = 0; char ext[4]; + long l; ext[3] = '\0'; ext[2] = toupper(str[len-1]); @@ -828,12 +838,18 @@ #ifdef HAVE_LONG_LONG if (is_u) { + errno = 0; val->ull = strtoull(str, NULL, radix); + if (val->ull == ULLONG_MAX && errno == ERANGE) + ppy_error("integer constant %s is too large\n", str); return tULONGLONG; } else { + errno = 0; val->sll = strtoll(str, NULL, radix); + if ((val->sll == LLONG_MIN || val->sll == LLONG_MAX) && errno == ERANGE) + ppy_error("integer constant %s is too large\n", str); return tSLONGLONG; } #else @@ -842,22 +858,38 @@ } else if(is_u && is_l) { + errno = 0; val->ulong = strtoul(str, NULL, radix); + if (val->ulong == ULONG_MAX && errno == ERANGE) + ppy_error("integer constant %s is too large\n", str); return tULONG; } else if(!is_u && is_l) { + errno = 0; val->slong = strtol(str, NULL, radix); + if ((val->slong == LONG_MIN || val->slong == LONG_MAX) && errno == ERANGE) + ppy_error("integer constant %s is too large\n", str); return tSLONG; } else if(is_u && !is_l) { - val->uint = (unsigned int)strtoul(str, NULL, radix); + unsigned long ul; + errno = 0; + ul = strtoul(str, NULL, radix); + if ((ul == ULONG_MAX && errno == ERANGE) || (ul > UINT_MAX)) + ppy_error("integer constant %s is too large\n", str); + val->uint = (unsigned int)ul; return tUINT; } /* Else it must be an int... */ - val->sint = (int)strtol(str, NULL, radix); + errno = 0; + l = strtol(str, NULL, radix); + if (((l == LONG_MIN || l == LONG_MAX) && errno == ERANGE) || + (l > INT_MAX) || (l < INT_MIN)) + ppy_error("integer constant %s is too large\n", str); + val->sint = (int)l; return tSINT; } @@ -1191,7 +1223,6 @@ bufferstack[bufferstackidx].ncontinuations = ncontinuations; bufferstack[bufferstackidx].incl = pp_incl_state; bufferstack[bufferstackidx].include_filename = incname; - bufferstack[bufferstackidx].pass_data = pass_data; if(ppp) ppp->expanding = 1; @@ -1254,7 +1285,6 @@ } free(pp_incl_state.ppp); pp_incl_state = bufferstack[bufferstackidx].incl; - pass_data = bufferstack[bufferstackidx].pass_data; } } @@ -1410,10 +1440,8 @@ { if(top_macro()) add_text_to_macro(s, len); - else { - if(pass_data) + else fwrite(s, 1, len, ppy_out); - } } @@ -1422,15 +1450,6 @@ * Include management *------------------------------------------------------------------------- */ -static int is_c_h_include(char *fname, int quoted) -{ - int sl=strlen(fname); - if (sl < 2 + 2 * quoted) return 0; - if ((toupper(fname[sl-1-quoted])!='H') && (toupper(fname[sl-1-quoted])!='C')) return 0; - if (fname[sl-2-quoted]!='.') return 0; - return 1; -} - void pp_do_include(char *fname, int type) { char *newpath; @@ -1466,12 +1485,10 @@ pp_incl_state.seen_junk = 0; pp_incl_state.state = 0; pp_incl_state.ppp = NULL; - if (is_c_h_include(newpath, 0)) pass_data=0; - else pass_data=1; if(pp_status.debug) - fprintf(stderr, "pp_do_include: %s:%d: include_state=%d, include_ppp='%s', include_ifdepth=%d ,pass_data=%d\n", - pp_status.input, pp_status.line_number, pp_incl_state.state, pp_incl_state.ppp, pp_incl_state.ifdepth, pass_data); + fprintf(stderr, "pp_do_include: %s:%d: include_state=%d, include_ppp='%s', include_ifdepth=%d\n", + pp_status.input, pp_status.line_number, pp_incl_state.state, pp_incl_state.ppp, pp_incl_state.ifdepth); ppy__switch_to_buffer(ppy__create_buffer(ppy_in, YY_BUF_SIZE)); fprintf(ppy_out, "# 1 \"%s\" 1%s\n", newpath, type ? "" : " 3"); Modified: trunk/reactos/tools/wpp/ppy.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wpp/ppy.tab.c?rev=37… ============================================================================== --- trunk/reactos/tools/wpp/ppy.tab.c [iso-8859-1] (original) +++ trunk/reactos/tools/wpp/ppy.tab.c [iso-8859-1] Wed Nov 5 15:47:55 2008 @@ -158,7 +158,7 @@ /* Copy the first part of user declarations. */ -#line 30 "tools\\wpp_new\\ppy.y" +#line 30 "ppy.y" #include "config.h" #include "wine/port.h" @@ -274,7 +274,7 @@ #endif #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) -#line 126 "tools\\wpp_new\\ppy.y" +#line 126 "ppy.y" typedef union YYSTYPE { int sint; unsigned int uint; @@ -289,7 +289,7 @@ mtext_t *mtext; } YYSTYPE; /* Line 196 of yacc.c. */ -#line 293 "tools\\wpp_new\\ppy.tab.c" +#line 293 "ppy.tab.c" # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 # define YYSTYPE_IS_TRIVIAL 1 @@ -301,7 +301,7 @@ /* Line 219 of yacc.c. */ -#line 305 "tools\\wpp_new\\ppy.tab.c" +#line 305 "ppy.tab.c" #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__) # define YYSIZE_T __SIZE_TYPE__ @@ -1214,7 +1214,7 @@ #endif #endif { - + int yystate; int yyn; int yyresult; @@ -1457,27 +1457,27 @@ switch (yyn) { case 4: -#line 186 "tools\\wpp_new\\ppy.y" +#line 186 "ppy.y" { pp_do_include((yyvsp[-1].cptr), 1); ;} break; case 5: -#line 187 "tools\\wpp_new\\ppy.y" +#line 187 "ppy.y" { pp_do_include((yyvsp[-1].cptr), 0); ;} break; case 6: -#line 188 "tools\\wpp_new\\ppy.y" +#line 188 "ppy.y" { pp_next_if_state(boolean(&(yyvsp[-1].cval))); ;} break; case 7: -#line 189 "tools\\wpp_new\\ppy.y" +#line 189 "ppy.y" { pp_next_if_state(pplookup((yyvsp[-1].cptr)) != NULL); free((yyvsp[-1].cptr)); ;} break; case 8: -#line 190 "tools\\wpp_new\\ppy.y" +#line 190 "ppy.y" { int t = pplookup((yyvsp[-1].cptr)) == NULL; if(pp_incl_state.state == 0 && t && !pp_incl_state.seen_junk) @@ -1501,7 +1501,7 @@ break; case 9: -#line 210 "tools\\wpp_new\\ppy.y" +#line 210 "ppy.y" { pp_if_state_t s = pp_pop_if(); switch(s) @@ -1526,7 +1526,7 @@ break; case 10: -#line 231 "tools\\wpp_new\\ppy.y" +#line 231 "ppy.y" { pp_if_state_t s = pp_pop_if(); switch(s) @@ -1553,7 +1553,7 @@ break; case 11: -#line 254 "tools\\wpp_new\\ppy.y" +#line 254 "ppy.y" { pp_pop_if(); if(pp_incl_state.ifdepth == pp_get_if_depth() && pp_incl_state.state == 1) @@ -1572,74 +1572,74 @@ break; case 12: -#line 269 "tools\\wpp_new\\ppy.y" +#line 269 "ppy.y" { pp_del_define((yyvsp[-1].cptr)); free((yyvsp[-1].cptr)); ;} break; case 13: -#line 270 "tools\\wpp_new\\ppy.y" +#line 270 "ppy.y" { pp_add_define((yyvsp[-2].cptr), (yyvsp[-1].cptr)); ;} break; case 14: -#line 271 "tools\\wpp_new\\ppy.y" +#line 271 "ppy.y" { pp_add_macro((yyvsp[-5].cptr), macro_args, nmacro_args, (yyvsp[-1].mtext)); ;} break; case 15: -#line 274 "tools\\wpp_new\\ppy.y" +#line 274 "ppy.y" { fprintf(ppy_out, "# %d %s\n", (yyvsp[-2].sint) , (yyvsp[-1].cptr)); free((yyvsp[-1].cptr)); ;} break; case 16: -#line 275 "tools\\wpp_new\\ppy.y" +#line 275 "ppy.y" { fprintf(ppy_out, "# %d %s\n", (yyvsp[-2].sint) , (yyvsp[-1].cptr)); free((yyvsp[-1].cptr)); ;} break; case 17: -#line 277 "tools\\wpp_new\\ppy.y" +#line 277 "ppy.y" { fprintf(ppy_out, "# %d %s %d\n", (yyvsp[-3].sint), (yyvsp[-2].cptr), (yyvsp[-1].sint)); free((yyvsp[-2].cptr)); ;} break; case 18: -#line 279 "tools\\wpp_new\\ppy.y" +#line 279 "ppy.y" { fprintf(ppy_out, "# %d %s %d %d\n", (yyvsp[-4].sint) ,(yyvsp[-3].cptr), (yyvsp[-2].sint), (yyvsp[-1].sint)); free((yyvsp[-3].cptr)); ;} break; case 19: -#line 281 "tools\\wpp_new\\ppy.y" +#line 281 "ppy.y" { fprintf(ppy_out, "# %d %s %d %d %d\n", (yyvsp[-5].sint) ,(yyvsp[-4].cptr) ,(yyvsp[-3].sint) ,(yyvsp[-2].sint), (yyvsp[-1].sint)); free((yyvsp[-4].cptr)); ;} break; case 20: -#line 283 "tools\\wpp_new\\ppy.y" +#line 283 "ppy.y" { fprintf(ppy_out, "# %d %s %d %d %d %d\n", (yyvsp[-6].sint) ,(yyvsp[-5].cptr) ,(yyvsp[-4].sint) ,(yyvsp[-3].sint), (yyvsp[-2].sint), (yyvsp[-1].sint)); free((yyvsp[-5].cptr)); ;} break; case 22: -#line 285 "tools\\wpp_new\\ppy.y" - { ppy_error("#error directive: '%s'", (yyvsp[-1].cptr)); if((yyvsp[-1].cptr)) free((yyvsp[-1].cptr)); ;} +#line 285 "ppy.y" + { ppy_error("#error directive: '%s'", (yyvsp[-1].cptr)); free((yyvsp[-1].cptr)); ;} break; case 23: -#line 286 "tools\\wpp_new\\ppy.y" - { ppy_warning("#warning directive: '%s'", (yyvsp[-1].cptr)); if((yyvsp[-1].cptr)) free((yyvsp[-1].cptr)); ;} +#line 286 "ppy.y" + { ppy_warning("#warning directive: '%s'", (yyvsp[-1].cptr)); free((yyvsp[-1].cptr)); ;} break; case 24: -#line 287 "tools\\wpp_new\\ppy.y" - { fprintf(ppy_out, "#pragma %s\n", (yyvsp[-1].cptr) ? (yyvsp[-1].cptr) : ""); if ((yyvsp[-1].cptr)) free((yyvsp[-1].cptr)); ;} +#line 287 "ppy.y" + { fprintf(ppy_out, "#pragma %s\n", (yyvsp[-1].cptr) ? (yyvsp[-1].cptr) : ""); free((yyvsp[-1].cptr)); ;} break; case 25: -#line 288 "tools\\wpp_new\\ppy.y" - { if(pp_status.pedantic) ppy_warning("#ident ignored (arg: '%s')", (yyvsp[-1].cptr)); if((yyvsp[-1].cptr)) free((yyvsp[-1].cptr)); ;} +#line 288 "ppy.y" + { if(pp_status.pedantic) ppy_warning("#ident ignored (arg: '%s')", (yyvsp[-1].cptr)); free((yyvsp[-1].cptr)); ;} break; case 26: -#line 289 "tools\\wpp_new\\ppy.y" +#line 289 "ppy.y" { int nl=strlen((yyvsp[0].cptr)) +3; char *fn=pp_xmalloc(nl); @@ -1650,94 +1650,94 @@ break; case 27: -#line 296 "tools\\wpp_new\\ppy.y" +#line 296 "ppy.y" { pp_do_include((yyvsp[0].cptr),1); ;} break; case 28: -#line 302 "tools\\wpp_new\\ppy.y" +#line 302 "ppy.y" { (yyval.cptr) = NULL; ;} break; case 29: -#line 303 "tools\\wpp_new\\ppy.y" +#line 303 "ppy.y" { (yyval.cptr) = (yyvsp[0].cptr); ;} break; case 30: -#line 306 "tools\\wpp_new\\ppy.y" +#line 306 "ppy.y" { (yyval.cptr) = (yyvsp[0].cptr); ;} break; case 31: -#line 307 "tools\\wpp_new\\ppy.y" +#line 307 "ppy.y" { (yyval.cptr) = (yyvsp[0].cptr); ;} break; case 32: -#line 308 "tools\\wpp_new\\ppy.y" +#line 308 "ppy.y" { (yyval.cptr) = (yyvsp[0].cptr); ;} break; case 33: -#line 309 "tools\\wpp_new\\ppy.y" +#line 309 "ppy.y" { (yyval.cptr) = merge_text((yyvsp[-1].cptr), (yyvsp[0].cptr)); ;} break; case 34: -#line 310 "tools\\wpp_new\\ppy.y" +#line 310 "ppy.y" { (yyval.cptr) = merge_text((yyvsp[-1].cptr), (yyvsp[0].cptr)); ;} break; case 35: -#line 311 "tools\\wpp_new\\ppy.y" +#line 311 "ppy.y" { (yyval.cptr) = merge_text((yyvsp[-1].cptr), (yyvsp[0].cptr)); ;} break; case 36: -#line 314 "tools\\wpp_new\\ppy.y" +#line 314 "ppy.y" { macro_args = NULL; nmacro_args = 0; ;} break; case 37: -#line 317 "tools\\wpp_new\\ppy.y" +#line 317 "ppy.y" { (yyval.sint) = 0; macro_args = NULL; nmacro_args = 0; ;} break; case 38: -#line 318 "tools\\wpp_new\\ppy.y" +#line 318 "ppy.y" { (yyval.sint) = nmacro_args; ;} break; case 39: -#line 321 "tools\\wpp_new\\ppy.y" +#line 321 "ppy.y" { (yyval.marg) = (yyvsp[0].marg); ;} break; case 40: -#line 322 "tools\\wpp_new\\ppy.y" +#line 322 "ppy.y" { (yyval.marg) = add_new_marg(NULL, arg_list); nmacro_args *= -1; ;} break; case 41: -#line 325 "tools\\wpp_new\\ppy.y" +#line 325 "ppy.y" { (yyval.marg) = add_new_marg((yyvsp[0].cptr), arg_single); ;} break; case 42: -#line 326 "tools\\wpp_new\\ppy.y" +#line 326 "ppy.y" { (yyval.marg) = add_new_marg((yyvsp[0].cptr), arg_single); ;} break; case 43: -#line 330 "tools\\wpp_new\\ppy.y" +#line 330 "ppy.y" { (yyval.mtext) = NULL; ;} break; case 44: -#line 331 "tools\\wpp_new\\ppy.y" +#line 331 "ppy.y" { for((yyval.mtext) = (yyvsp[0].mtext); (yyval.mtext) && (yyval.mtext)->prev; (yyval.mtext) = (yyval.mtext)->prev) ; @@ -1745,37 +1745,37 @@ break; case 45: -#line 337 "tools\\wpp_new\\ppy.y" +#line 337 "ppy.y" { (yyval.mtext) = (yyvsp[0].mtext); ;} break; case 46: -#line 338 "tools\\wpp_new\\ppy.y" +#line 338 "ppy.y" { (yyval.mtext) = combine_mtext((yyvsp[-1].mtext), (yyvsp[0].mtext)); ;} break; case 47: -#line 341 "tools\\wpp_new\\ppy.y" +#line 341 "ppy.y" { (yyval.mtext) = new_mtext((yyvsp[0].cptr), 0, exp_text); ;} break; case 48: -#line 342 "tools\\wpp_new\\ppy.y" +#line 342 "ppy.y" { (yyval.mtext) = new_mtext((yyvsp[0].cptr), 0, exp_text); ;} break; case 49: -#line 343 "tools\\wpp_new\\ppy.y" +#line 343 "ppy.y" { (yyval.mtext) = new_mtext((yyvsp[0].cptr), 0, exp_text); ;} break; case 50: -#line 344 "tools\\wpp_new\\ppy.y" +#line 344 "ppy.y" { (yyval.mtext) = new_mtext(NULL, 0, exp_concat); ;} break; case 51: -#line 345 "tools\\wpp_new\\ppy.y" +#line 345 "ppy.y" { int mat = marg_index((yyvsp[0].cptr)); if(mat < 0) @@ -1785,7 +1785,7 @@ break; case 52: -#line 351 "tools\\wpp_new\\ppy.y" +#line 351 "ppy.y" { int mat = marg_index((yyvsp[0].cptr)); if(mat >= 0) @@ -1796,162 +1796,162 @@ break; case 53: -#line 360 "tools\\wpp_new\\ppy.y" +#line 360 "ppy.y" { (yyval.cval).type = cv_sint; (yyval.cval).val.si = (yyvsp[0].sint); ;} break; case 54: -#line 361 "tools\\wpp_new\\ppy.y" +#line 361 "ppy.y" { (yyval.cval).type = cv_uint; (yyval.cval).val.ui = (yyvsp[0].uint); ;} break; case 55: -#line 362 "tools\\wpp_new\\ppy.y" +#line 362 "ppy.y" { (yyval.cval).type = cv_slong; (yyval.cval).val.sl = (yyvsp[0].slong); ;} break; case 56: -#line 363 "tools\\wpp_new\\ppy.y" +#line 363 "ppy.y" { (yyval.cval).type = cv_ulong; (yyval.cval).val.ul = (yyvsp[0].ulong); ;} break; case 57: -#line 364 "tools\\wpp_new\\ppy.y" +#line 364 "ppy.y" { (yyval.cval).type = cv_sll; (yyval.cval).val.sll = (yyvsp[0].sll); ;} break; case 58: -#line 365 "tools\\wpp_new\\ppy.y" +#line 365 "ppy.y" { (yyval.cval).type = cv_ull; (yyval.cval).val.ull = (yyvsp[0].ull); ;} break; case 59: -#line 366 "tools\\wpp_new\\ppy.y" +#line 366 "ppy.y" { (yyval.cval).type = cv_sint; (yyval.cval).val.si = pplookup((yyvsp[0].cptr)) != NULL; ;} break; case 60: -#line 367 "tools\\wpp_new\\ppy.y" +#line 367 "ppy.y" { (yyval.cval).type = cv_sint; (yyval.cval).val.si = pplookup((yyvsp[-1].cptr)) != NULL; ;} break; case 61: -#line 368 "tools\\wpp_new\\ppy.y" +#line 368 "ppy.y" { (yyval.cval).type = cv_sint; (yyval.cval).val.si = 0; ;} break; case 62: -#line 369 "tools\\wpp_new\\ppy.y" +#line 369 "ppy.y" { (yyval.cval).type = cv_sint; (yyval.cval).val.si = boolean(&(yyvsp[-2].cval)) || boolean(&(yyvsp[0].cval)); ;} break; case 63: -#line 370 "tools\\wpp_new\\ppy.y" +#line 370 "ppy.y" { (yyval.cval).type = cv_sint; (yyval.cval).val.si = boolean(&(yyvsp[-2].cval)) && boolean(&(yyvsp[0].cval)); ;} break; case 64: -#line 371 "tools\\wpp_new\\ppy.y" +#line 371 "ppy.y" { promote_equal_size(&(yyvsp[-2].cval), &(yyvsp[0].cval)); BIN_OP((yyval.cval), (yyvsp[-2].cval), (yyvsp[0].cval), ==) ;} break; case 65: -#line 372 "tools\\wpp_new\\ppy.y" +#line 372 "ppy.y" { promote_equal_size(&(yyvsp[-2].cval), &(yyvsp[0].cval)); BIN_OP((yyval.cval), (yyvsp[-2].cval), (yyvsp[0].cval), !=) ;} break; case 66: -#line 373 "tools\\wpp_new\\ppy.y" +#line 373 "ppy.y" { promote_equal_size(&(yyvsp[-2].cval), &(yyvsp[0].cval)); BIN_OP((yyval.cval), (yyvsp[-2].cval), (yyvsp[0].cval), <) ;} break; case 67: -#line 374 "tools\\wpp_new\\ppy.y" +#line 374 "ppy.y" { promote_equal_size(&(yyvsp[-2].cval), &(yyvsp[0].cval)); BIN_OP((yyval.cval), (yyvsp[-2].cval), (yyvsp[0].cval), >) ;} break; case 68: -#line 375 "tools\\wpp_new\\ppy.y" +#line 375 "ppy.y" { promote_equal_size(&(yyvsp[-2].cval), &(yyvsp[0].cval)); BIN_OP((yyval.cval), (yyvsp[-2].cval), (yyvsp[0].cval), <=) ;} break; case 69: -#line 376 "tools\\wpp_new\\ppy.y" +#line 376 "ppy.y" { promote_equal_size(&(yyvsp[-2].cval), &(yyvsp[0].cval)); BIN_OP((yyval.cval), (yyvsp[-2].cval), (yyvsp[0].cval), >=) ;} break; case 70: -#line 377 "tools\\wpp_new\\ppy.y" +#line 377 "ppy.y" { promote_equal_size(&(yyvsp[-2].cval), &(yyvsp[0].cval)); BIN_OP((yyval.cval), (yyvsp[-2].cval), (yyvsp[0].cval), +) ;} break; case 71: -#line 378 "tools\\wpp_new\\ppy.y" +#line 378 "ppy.y" { promote_equal_size(&(yyvsp[-2].cval), &(yyvsp[0].cval)); BIN_OP((yyval.cval), (yyvsp[-2].cval), (yyvsp[0].cval), -) ;} break; case 72: -#line 379 "tools\\wpp_new\\ppy.y" +#line 379 "ppy.y" { promote_equal_size(&(yyvsp[-2].cval), &(yyvsp[0].cval)); BIN_OP((yyval.cval), (yyvsp[-2].cval), (yyvsp[0].cval), ^) ;} break; case 73: -#line 380 "tools\\wpp_new\\ppy.y" +#line 380 "ppy.y" { promote_equal_size(&(yyvsp[-2].cval), &(yyvsp[0].cval)); BIN_OP((yyval.cval), (yyvsp[-2].cval), (yyvsp[0].cval), &) ;} break; case 74: -#line 381 "tools\\wpp_new\\ppy.y" +#line 381 "ppy.y" { promote_equal_size(&(yyvsp[-2].cval), &(yyvsp[0].cval)); BIN_OP((yyval.cval), (yyvsp[-2].cval), (yyvsp[0].cval), |) ;} break; case 75: -#line 382 "tools\\wpp_new\\ppy.y" +#line 382 "ppy.y" { promote_equal_size(&(yyvsp[-2].cval), &(yyvsp[0].cval)); BIN_OP((yyval.cval), (yyvsp[-2].cval), (yyvsp[0].cval), *) ;} break; case 76: -#line 383 "tools\\wpp_new\\ppy.y" +#line 383 "ppy.y" { promote_equal_size(&(yyvsp[-2].cval), &(yyvsp[0].cval)); BIN_OP((yyval.cval), (yyvsp[-2].cval), (yyvsp[0].cval), /) ;} break; case 77: -#line 384 "tools\\wpp_new\\ppy.y" +#line 384 "ppy.y" { promote_equal_size(&(yyvsp[-2].cval), &(yyvsp[0].cval)); BIN_OP((yyval.cval), (yyvsp[-2].cval), (yyvsp[0].cval), <<) ;} break; case 78: -#line 385 "tools\\wpp_new\\ppy.y" +#line 385 "ppy.y" { promote_equal_size(&(yyvsp[-2].cval), &(yyvsp[0].cval)); BIN_OP((yyval.cval), (yyvsp[-2].cval), (yyvsp[0].cval), >>) ;} break; case 79: -#line 386 "tools\\wpp_new\\ppy.y" +#line 386 "ppy.y" { (yyval.cval) = (yyvsp[0].cval); ;} break; case 80: -#line 387 "tools\\wpp_new\\ppy.y" +#line 387 "ppy.y" { UNARY_OP((yyval.cval), (yyvsp[0].cval), -) ;} break; case 81: -#line 388 "tools\\wpp_new\\ppy.y" +#line 388 "ppy.y" { UNARY_OP((yyval.cval), (yyvsp[0].cval), ~) ;} break; case 82: -#line 389 "tools\\wpp_new\\ppy.y" +#line 389 "ppy.y" { (yyval.cval).type = cv_sint; (yyval.cval).val.si = !boolean(&(yyvsp[0].cval)); ;} break; case 83: -#line 390 "tools\\wpp_new\\ppy.y" +#line 390 "ppy.y" { (yyval.cval) = (yyvsp[-1].cval); ;} break; case 84: -#line 391 "tools\\wpp_new\\ppy.y" +#line 391 "ppy.y" { (yyval.cval) = boolean(&(yyvsp[-4].cval)) ? (yyvsp[-2].cval) : (yyvsp[0].cval); ;} break; @@ -1960,7 +1960,7 @@ } /* Line 1126 of yacc.c. */ -#line 1964 "tools\\wpp_new\\ppy.tab.c" +#line 1964 "ppy.tab.c" yyvsp -= yylen; yyssp -= yylen; @@ -2228,7 +2228,7 @@ } -#line 394 "tools\\wpp_new\\ppy.y" +#line 394 "ppy.y" /* Modified: trunk/reactos/tools/wpp/ppy.tab.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wpp/ppy.tab.h?rev=37… ============================================================================== --- trunk/reactos/tools/wpp/ppy.tab.h [iso-8859-1] (original) +++ trunk/reactos/tools/wpp/ppy.tab.h [iso-8859-1] Wed Nov 5 15:47:55 2008 @@ -123,7 +123,7 @@ #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) -#line 126 "tools\\wpp_new\\ppy.y" +#line 126 "ppy.y" typedef union YYSTYPE { int sint; unsigned int uint; @@ -138,7 +138,7 @@ mtext_t *mtext; } YYSTYPE; /* Line 1447 of yacc.c. */ -#line 142 "tools\\wpp_new\\ppy.tab.h" +#line 142 "ppy.tab.h" # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 # define YYSTYPE_IS_TRIVIAL 1 Modified: trunk/reactos/tools/wpp/ppy.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wpp/ppy.y?rev=37204&… ============================================================================== --- trunk/reactos/tools/wpp/ppy.y [iso-8859-1] (original) +++ trunk/reactos/tools/wpp/ppy.y [iso-8859-1] Wed Nov 5 15:47:55 2008 @@ -282,10 +282,10 @@ | tGCCLINE tSINT tDQSTRING tSINT tSINT tSINT tSINT tNL { fprintf(ppy_out, "# %d %s %d %d %d %d\n", $2 ,$3 ,$4 ,$5, $6, $7); free($3); } | tGCCLINE tNL /* The null-token */ - | tERROR opt_text tNL { ppy_error("#error directive: '%s'", $2); if($2) free($2); } - | tWARNING opt_text tNL { ppy_warning("#warning directive: '%s'", $2); if($2) free($2); } - | tPRAGMA opt_text tNL { fprintf(ppy_out, "#pragma %s\n", $2 ? $2 : ""); if ($2) free($2); } - | tPPIDENT opt_text tNL { if(pp_status.pedantic) ppy_warning("#ident ignored (arg: '%s')", $2); if($2) free($2); } + | tERROR opt_text tNL { ppy_error("#error directive: '%s'", $2); free($2); } + | tWARNING opt_text tNL { ppy_warning("#warning directive: '%s'", $2); free($2); } + | tPRAGMA opt_text tNL { fprintf(ppy_out, "#pragma %s\n", $2 ? $2 : ""); free($2); } + | tPPIDENT opt_text tNL { if(pp_status.pedantic) ppy_warning("#ident ignored (arg: '%s')", $2); free($2); } | tRCINCLUDE tRCINCLUDEPATH { int nl=strlen($2) +3; char *fn=pp_xmalloc(nl); Modified: trunk/reactos/tools/wpp/wpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wpp/wpp.c?rev=37204&… ============================================================================== --- trunk/reactos/tools/wpp/wpp.c [iso-8859-1] (original) +++ trunk/reactos/tools/wpp/wpp.c [iso-8859-1] Wed Nov 5 15:47:55 2008 @@ -1,7 +1,7 @@ /* * Exported functions of the Wine preprocessor * - * Copyrignt 1998 Bertho A. Stultiens + * Copyright 1998 Bertho A. Stultiens * Copyright 2002 Alexandre Julliard * * This library is free software; you can redistribute it and/or Modified: trunk/reactos/tools/wpp/wpp_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wpp/wpp_private.h?re… ============================================================================== --- trunk/reactos/tools/wpp/wpp_private.h [iso-8859-1] (original) +++ trunk/reactos/tools/wpp/wpp_private.h [iso-8859-1] Wed Nov 5 15:47:55 2008 @@ -181,7 +181,7 @@ ctype_t type; union { #if 0 - signed char sc; /* Explicitely signed because compilers are stupid */ + signed char sc; /* Explicitly signed because compilers are stupid */ unsigned char uc; short ss; unsigned short us;

15 years, 10 months

[fireball] 37203: - Update unicode lib to Wine-20081105 (~1.1.7 release).

by fireball＠svn.reactos.org

Author: fireball Date: Wed Nov 5 15:35:45 2008 New Revision: 37203 URL: http://svn.reactos.org/svn/reactos?rev=37203&view=rev Log: - Update unicode lib to Wine-20081105 (~1.1.7 release). Added: trunk/reactos/tools/unicode/c_1361.c (with props) trunk/reactos/tools/unicode/c_20127.c (with props) Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/tools/unicode/Makefile.in trunk/reactos/tools/unicode/c_037.c trunk/reactos/tools/unicode/c_10000.c trunk/reactos/tools/unicode/c_10006.c trunk/reactos/tools/unicode/c_10007.c trunk/reactos/tools/unicode/c_10029.c trunk/reactos/tools/unicode/c_1006.c trunk/reactos/tools/unicode/c_10079.c trunk/reactos/tools/unicode/c_10081.c trunk/reactos/tools/unicode/c_1026.c trunk/reactos/tools/unicode/c_1250.c trunk/reactos/tools/unicode/c_1251.c trunk/reactos/tools/unicode/c_1252.c trunk/reactos/tools/unicode/c_1253.c trunk/reactos/tools/unicode/c_1254.c trunk/reactos/tools/unicode/c_1255.c trunk/reactos/tools/unicode/c_1256.c trunk/reactos/tools/unicode/c_1257.c trunk/reactos/tools/unicode/c_1258.c trunk/reactos/tools/unicode/c_20866.c trunk/reactos/tools/unicode/c_21866.c trunk/reactos/tools/unicode/c_28591.c trunk/reactos/tools/unicode/c_28592.c trunk/reactos/tools/unicode/c_28593.c trunk/reactos/tools/unicode/c_28594.c trunk/reactos/tools/unicode/c_28595.c trunk/reactos/tools/unicode/c_28596.c trunk/reactos/tools/unicode/c_28597.c trunk/reactos/tools/unicode/c_28598.c trunk/reactos/tools/unicode/c_28599.c trunk/reactos/tools/unicode/c_28600.c trunk/reactos/tools/unicode/c_28603.c trunk/reactos/tools/unicode/c_28604.c trunk/reactos/tools/unicode/c_28605.c trunk/reactos/tools/unicode/c_28606.c trunk/reactos/tools/unicode/c_424.c trunk/reactos/tools/unicode/c_437.c trunk/reactos/tools/unicode/c_500.c trunk/reactos/tools/unicode/c_737.c trunk/reactos/tools/unicode/c_775.c trunk/reactos/tools/unicode/c_850.c trunk/reactos/tools/unicode/c_852.c trunk/reactos/tools/unicode/c_855.c trunk/reactos/tools/unicode/c_856.c trunk/reactos/tools/unicode/c_857.c trunk/reactos/tools/unicode/c_860.c trunk/reactos/tools/unicode/c_861.c trunk/reactos/tools/unicode/c_862.c trunk/reactos/tools/unicode/c_863.c trunk/reactos/tools/unicode/c_864.c trunk/reactos/tools/unicode/c_865.c trunk/reactos/tools/unicode/c_866.c trunk/reactos/tools/unicode/c_869.c trunk/reactos/tools/unicode/c_874.c trunk/reactos/tools/unicode/c_875.c trunk/reactos/tools/unicode/c_878.c trunk/reactos/tools/unicode/casemap.c trunk/reactos/tools/unicode/compose.c trunk/reactos/tools/unicode/cpmap.pl trunk/reactos/tools/unicode/cptable.c trunk/reactos/tools/unicode/mbtowc.c trunk/reactos/tools/unicode/sortkey.c trunk/reactos/tools/unicode/string.c trunk/reactos/tools/unicode/unicode.rbuild trunk/reactos/tools/unicode/utf8.c trunk/reactos/tools/unicode/wctomb.c trunk/reactos/tools/unicode/wctype.c trunk/reactos/tools/unicode/wine/unicode.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… Modified: trunk/reactos/tools/unicode/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/Makefile.in?… Modified: trunk/reactos/tools/unicode/c_037.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_037.c?rev=… Modified: trunk/reactos/tools/unicode/c_10000.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_10000.c?re… Modified: trunk/reactos/tools/unicode/c_10006.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_10006.c?re… Modified: trunk/reactos/tools/unicode/c_10007.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_10007.c?re… Modified: trunk/reactos/tools/unicode/c_10029.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_10029.c?re… Modified: trunk/reactos/tools/unicode/c_1006.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_1006.c?rev… Modified: trunk/reactos/tools/unicode/c_10079.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_10079.c?re… Modified: trunk/reactos/tools/unicode/c_10081.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_10081.c?re… Modified: trunk/reactos/tools/unicode/c_1026.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_1026.c?rev… Modified: trunk/reactos/tools/unicode/c_1250.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_1250.c?rev… Modified: trunk/reactos/tools/unicode/c_1251.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_1251.c?rev… Modified: trunk/reactos/tools/unicode/c_1252.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_1252.c?rev… Modified: trunk/reactos/tools/unicode/c_1253.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_1253.c?rev… Modified: trunk/reactos/tools/unicode/c_1254.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_1254.c?rev… Modified: trunk/reactos/tools/unicode/c_1255.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_1255.c?rev… Modified: trunk/reactos/tools/unicode/c_1256.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_1256.c?rev… Modified: trunk/reactos/tools/unicode/c_1257.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_1257.c?rev… Modified: trunk/reactos/tools/unicode/c_1258.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_1258.c?rev… Added: trunk/reactos/tools/unicode/c_1361.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_1361.c?rev… Added: trunk/reactos/tools/unicode/c_20127.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_20127.c?re… Modified: trunk/reactos/tools/unicode/c_20866.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_20866.c?re… Modified: trunk/reactos/tools/unicode/c_21866.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_21866.c?re… Modified: trunk/reactos/tools/unicode/c_28591.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28591.c?re… Modified: trunk/reactos/tools/unicode/c_28592.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28592.c?re… Modified: trunk/reactos/tools/unicode/c_28593.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28593.c?re… Modified: trunk/reactos/tools/unicode/c_28594.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28594.c?re… Modified: trunk/reactos/tools/unicode/c_28595.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28595.c?re… Modified: trunk/reactos/tools/unicode/c_28596.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28596.c?re… Modified: trunk/reactos/tools/unicode/c_28597.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28597.c?re… Modified: trunk/reactos/tools/unicode/c_28598.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28598.c?re… Modified: trunk/reactos/tools/unicode/c_28599.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28599.c?re… Modified: trunk/reactos/tools/unicode/c_28600.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28600.c?re… Modified: trunk/reactos/tools/unicode/c_28603.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28603.c?re… Modified: trunk/reactos/tools/unicode/c_28604.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28604.c?re… Modified: trunk/reactos/tools/unicode/c_28605.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28605.c?re… Modified: trunk/reactos/tools/unicode/c_28606.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28606.c?re… Modified: trunk/reactos/tools/unicode/c_424.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_424.c?rev=… Modified: trunk/reactos/tools/unicode/c_437.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_437.c?rev=… Modified: trunk/reactos/tools/unicode/c_500.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_500.c?rev=… Modified: trunk/reactos/tools/unicode/c_737.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_737.c?rev=… Modified: trunk/reactos/tools/unicode/c_775.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_775.c?rev=… Modified: trunk/reactos/tools/unicode/c_850.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_850.c?rev=… Modified: trunk/reactos/tools/unicode/c_852.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_852.c?rev=… Modified: trunk/reactos/tools/unicode/c_855.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_855.c?rev=… Modified: trunk/reactos/tools/unicode/c_856.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_856.c?rev=… Modified: trunk/reactos/tools/unicode/c_857.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_857.c?rev=… Modified: trunk/reactos/tools/unicode/c_860.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_860.c?rev=… Modified: trunk/reactos/tools/unicode/c_861.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_861.c?rev=… Modified: trunk/reactos/tools/unicode/c_862.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_862.c?rev=… Modified: trunk/reactos/tools/unicode/c_863.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_863.c?rev=… Modified: trunk/reactos/tools/unicode/c_864.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_864.c?rev=… Modified: trunk/reactos/tools/unicode/c_865.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_865.c?rev=… Modified: trunk/reactos/tools/unicode/c_866.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_866.c?rev=… Modified: trunk/reactos/tools/unicode/c_869.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_869.c?rev=… Modified: trunk/reactos/tools/unicode/c_874.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_874.c?rev=… Modified: trunk/reactos/tools/unicode/c_875.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_875.c?rev=… Modified: trunk/reactos/tools/unicode/c_878.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_878.c?rev=… Modified: trunk/reactos/tools/unicode/casemap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/casemap.c?re… Modified: trunk/reactos/tools/unicode/compose.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/compose.c?re… Modified: trunk/reactos/tools/unicode/cpmap.pl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/cpmap.pl?rev… Modified: trunk/reactos/tools/unicode/cptable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/cptable.c?re… Modified: trunk/reactos/tools/unicode/mbtowc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/mbtowc.c?rev… Modified: trunk/reactos/tools/unicode/sortkey.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/sortkey.c?re… Modified: trunk/reactos/tools/unicode/string.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/string.c?rev… Modified: trunk/reactos/tools/unicode/unicode.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/unicode.rbui… Modified: trunk/reactos/tools/unicode/utf8.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/utf8.c?rev=3… Modified: trunk/reactos/tools/unicode/wctomb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/wctomb.c?rev… Modified: trunk/reactos/tools/unicode/wctype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/wctype.c?rev… Modified: trunk/reactos/tools/unicode/wine/unicode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/wine/unicode…

15 years, 10 months

[fireball] 37239: - Import rpcss from Wine. It has a serious disadvantage: it's not a real service, but a simple exe app, which (in ReactOS) just infinitely waits after being started. In order to turn it into a real startable/stoppable service, ole32 needs to be modified to make it proper. Which is probably against Wine policy of "let's hack it together to make it work somehow and forget about it".

by fireball＠svn.reactos.org

Author: fireball Date: Fri Nov 7 04:52:49 2008 New Revision: 37239 URL: http://svn.reactos.org/svn/reactos?rev=37239&view=rev Log: - Import rpcss from Wine. It has a serious disadvantage: it's not a real service, but a simple exe app, which (in ReactOS) just infinitely waits after being started. In order to turn it into a real startable/stoppable service, ole32 needs to be modified to make it proper. Which is probably against Wine policy of "let's hack it together to make it work somehow and forget about it". Added: trunk/reactos/base/services/rpcss/epm.idl trunk/reactos/base/services/rpcss/epmp.c (with props) trunk/reactos/base/services/rpcss/irot.idl trunk/reactos/base/services/rpcss/irotp.c (with props) trunk/reactos/base/services/rpcss/rpcss_main.c (with props) Removed: trunk/reactos/base/services/rpcss/endpoint.c trunk/reactos/base/services/rpcss/rpcss.c Modified: trunk/reactos/base/services/rpcss/rpcss.h trunk/reactos/base/services/rpcss/rpcss.rbuild Removed: trunk/reactos/base/services/rpcss/endpoint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/endpoi… ============================================================================== --- trunk/reactos/base/services/rpcss/endpoint.c [iso-8859-1] (original) +++ trunk/reactos/base/services/rpcss/endpoint.c (removed) @@ -1,27 +1,0 @@ -/* - * PROJECT: ReactOS RpcSs service - * LICENSE: GPL - See COPYING in the top level directory - * FILE: services/rpcss/rpcss.c - * PURPOSE: Endpoint mapper - * COPYRIGHT: Copyright 2002 Eric Kohl - */ - -/* INCLUDES *****************************************************************/ - -#include "rpc.h" - -/* FUNCTIONS ****************************************************************/ - -VOID -StartEndpointMapper(VOID) -{ -#if 0 - RpcServerRegisterProtseqW("ncacn_np", 1, "\pipe\epmapper"); - - RpcServerRegisterProtseqW("ncalrpc", 1, "epmapper"); - - RpcServerRegisterIf(epmapper_InterfaceHandle, 0, 0); -#endif -} - -/* EOF */ Added: trunk/reactos/base/services/rpcss/epm.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/epm.id… ============================================================================== --- trunk/reactos/base/services/rpcss/epm.idl (added) +++ trunk/reactos/base/services/rpcss/epm.idl [iso-8859-1] Fri Nov 7 04:52:49 2008 @@ -1,0 +1,19 @@ +/* + * Copyright 2008 Robert Shearman + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/epm.idl" Added: trunk/reactos/base/services/rpcss/epmp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/epmp.c… ============================================================================== --- trunk/reactos/base/services/rpcss/epmp.c (added) +++ trunk/reactos/base/services/rpcss/epmp.c [iso-8859-1] Fri Nov 7 04:52:49 2008 @@ -1,0 +1,284 @@ +/* + * Endpoint Mapper + * + * Copyright (C) 2007 Robert Shearman for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "epm_s.h" + +#include "wine/debug.h" +#include "wine/list.h" + +WINE_DEFAULT_DEBUG_CHANNEL(ole); + +struct registered_ept_entry +{ + struct list entry; + GUID object; + RPC_SYNTAX_IDENTIFIER iface; + RPC_SYNTAX_IDENTIFIER syntax; + char *protseq; + char *endpoint; + char *address; + char annotation[ept_max_annotation_size]; +}; + +static struct list registered_ept_entry_list = LIST_INIT(registered_ept_entry_list); + +static CRITICAL_SECTION csEpm; +static CRITICAL_SECTION_DEBUG critsect_debug = +{ + 0, 0, &csEpm, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": csEpm") } +}; +static CRITICAL_SECTION csEpm = { &critsect_debug, -1, 0, 0, 0, 0 }; + +static const UUID nil_object; + +/* must be called inside csEpm */ +static void delete_registered_ept_entry(struct registered_ept_entry *entry) +{ + I_RpcFree(entry->protseq); + I_RpcFree(entry->endpoint); + I_RpcFree(entry->address); + list_remove(&entry->entry); + HeapFree(GetProcessHeap(), 0, entry); +} + +static struct registered_ept_entry *find_ept_entry( + const RPC_SYNTAX_IDENTIFIER *iface, const RPC_SYNTAX_IDENTIFIER *syntax, + const char *protseq, const char *endpoint, const char *address, + const UUID *object) +{ + struct registered_ept_entry *entry; + LIST_FOR_EACH_ENTRY(entry, &registered_ept_entry_list, struct registered_ept_entry, entry) + { + if (memcmp(&entry->iface, iface, sizeof(RPC_SYNTAX_IDENTIFIER))) continue; + if (memcmp(&entry->syntax, syntax, sizeof(RPC_SYNTAX_IDENTIFIER))) continue; + if (strcmp(entry->protseq, protseq)) continue; + if (memcmp(&entry->object, object, sizeof(UUID))) continue; + WINE_TRACE("found entry with iface %d.%d %s, syntax %d.%d %s, protseq %s, object %s\n", + entry->iface.SyntaxVersion.MajorVersion, entry->iface.SyntaxVersion.MinorVersion, + wine_dbgstr_guid(&entry->iface.SyntaxGUID), + entry->syntax.SyntaxVersion.MajorVersion, entry->syntax.SyntaxVersion.MinorVersion, + wine_dbgstr_guid(&entry->syntax.SyntaxGUID), protseq, + wine_dbgstr_guid(&entry->object)); + return entry; + } + WINE_TRACE("not found\n"); + return NULL; +} + +void __RPC_USER ept_lookup_handle_t_rundown(ept_lookup_handle_t entry_handle) +{ + WINE_FIXME("%p\n", entry_handle); +} + +void ept_insert(handle_t h, + unsigned32 num_ents, + ept_entry_t entries[], + boolean32 replace, + error_status_t *status) +{ + unsigned32 i; + RPC_STATUS rpc_status; + + WINE_TRACE("(%p, %lu, %p, %lu, %p)\n", h, num_ents, entries, replace, status); + + *status = RPC_S_OK; + + EnterCriticalSection(&csEpm); + + for (i = 0; i < num_ents; i++) + { + struct registered_ept_entry *entry = HeapAlloc(GetProcessHeap(), 0, sizeof(*entry)); + if (!entry) + { + /* FIXME: cleanup code to delete added entries */ + *status = EPT_S_CANT_PERFORM_OP; + break; + } + list_init(&entry->entry); + memcpy(entry->annotation, entries[i].annotation, sizeof(entries[i].annotation)); + rpc_status = TowerExplode(entries[i].tower, &entry->iface, &entry->syntax, + &entry->protseq, &entry->endpoint, + &entry->address); + if (rpc_status != RPC_S_OK) + { + WINE_WARN("TowerExplode failed %lu\n", rpc_status); + *status = rpc_status; + break; /* FIXME: more cleanup? */ + } + + entry->object = entries[i].object; + + if (replace) + { + /* FIXME: correct find algorithm */ + struct registered_ept_entry *old_entry = find_ept_entry(&entry->iface, &entry->syntax, entry->protseq, entry->endpoint, entry->address, &entry->object); + if (old_entry) delete_registered_ept_entry(old_entry); + } + list_add_tail(&registered_ept_entry_list, &entry->entry); + } + + LeaveCriticalSection(&csEpm); +} + +void ept_delete(handle_t h, + unsigned32 num_ents, + ept_entry_t entries[], + error_status_t *status) +{ + unsigned32 i; + RPC_STATUS rpc_status; + + *status = RPC_S_OK; + + WINE_TRACE("(%p, %lu, %p, %p)\n", h, num_ents, entries, status); + + EnterCriticalSection(&csEpm); + + for (i = 0; i < num_ents; i++) + { + struct registered_ept_entry *entry; + RPC_SYNTAX_IDENTIFIER iface, syntax; + char *protseq; + char *endpoint; + char *address; + rpc_status = TowerExplode(entries[i].tower, &iface, &syntax, &protseq, + &endpoint, &address); + if (rpc_status != RPC_S_OK) + break; + entry = find_ept_entry(&iface, &syntax, protseq, endpoint, address, &entries[i].object); + if (entry) + delete_registered_ept_entry(entry); + else + { + *status = EPT_S_NOT_REGISTERED; + break; + } + I_RpcFree(protseq); + I_RpcFree(endpoint); + I_RpcFree(address); + } + + LeaveCriticalSection(&csEpm); +} + +void ept_lookup(handle_t h, + unsigned32 inquiry_type, + uuid_p_t object, + rpc_if_id_p_t interface_id, + unsigned32 vers_option, + ept_lookup_handle_t *entry_handle, + unsigned32 max_ents, + unsigned32 *num_ents, + ept_entry_t entries[], + error_status_t *status) +{ + WINE_FIXME("(%p, %p, %p): stub\n", h, entry_handle, status); + + *status = EPT_S_CANT_PERFORM_OP; +} + +void ept_map(handle_t h, + uuid_p_t object, + twr_p_t map_tower, + ept_lookup_handle_t *entry_handle, + unsigned32 max_towers, + unsigned32 *num_towers, + twr_p_t *towers, + error_status_t *status) +{ + RPC_STATUS rpc_status; + RPC_SYNTAX_IDENTIFIER iface, syntax; + char *protseq; + struct registered_ept_entry *entry; + + *status = RPC_S_OK; + *num_towers = 0; + + WINE_TRACE("(%p, %p, %p, %p, %lu, %p, %p, %p)\n", h, object, map_tower, + entry_handle, max_towers, num_towers, towers, status); + + rpc_status = TowerExplode(map_tower, &iface, &syntax, &protseq, + NULL, NULL); + if (rpc_status != RPC_S_OK) + { + *status = rpc_status; + return; + } + + EnterCriticalSection(&csEpm); + + LIST_FOR_EACH_ENTRY(entry, &registered_ept_entry_list, struct registered_ept_entry, entry) + { + if (IsEqualGUID(&entry->iface.SyntaxGUID, &iface.SyntaxGUID) && + (entry->iface.SyntaxVersion.MajorVersion == iface.SyntaxVersion.MajorVersion) && + (entry->iface.SyntaxVersion.MinorVersion >= iface.SyntaxVersion.MinorVersion) && + !memcmp(&entry->syntax, &syntax, sizeof(syntax)) && + !strcmp(entry->protseq, protseq) && + ((!object && IsEqualGUID(&entry->object, &nil_object)) || IsEqualGUID(object, &entry->object))) + { + if (*num_towers < max_towers) + { + rpc_status = TowerConstruct(&entry->iface, &entry->syntax, + entry->protseq, entry->endpoint, + entry->address, + &towers[*num_towers]); + if (rpc_status != RPC_S_OK) + { + *status = rpc_status; + break; /* FIXME: more cleanup? */ + } + } + (*num_towers)++; + } + } + + LeaveCriticalSection(&csEpm); +} + +void ept_lookup_handle_free(handle_t h, + ept_lookup_handle_t *entry_handle, + error_status_t *status) +{ + WINE_FIXME("(%p, %p, %p): stub\n", h, entry_handle, status); + + *status = EPT_S_CANT_PERFORM_OP; +} + +void ept_inq_object(handle_t h, + GUID *ept_object, + error_status_t *status) +{ + WINE_FIXME("(%p, %p, %p): stub\n", h, ept_object, status); + + *status = EPT_S_CANT_PERFORM_OP; +} + +void ept_mgmt_delete(handle_t h, + boolean32 object_speced, + uuid_p_t object, + twr_p_t tower, + error_status_t *status) +{ + WINE_FIXME("(%p, %ld, %p, %p, %p): stub\n", h, object_speced, object, tower, status); + + *status = EPT_S_CANT_PERFORM_OP; +} Propchange: trunk/reactos/base/services/rpcss/epmp.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/services/rpcss/irot.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/irot.i… ============================================================================== --- trunk/reactos/base/services/rpcss/irot.idl (added) +++ trunk/reactos/base/services/rpcss/irot.idl [iso-8859-1] Fri Nov 7 04:52:49 2008 @@ -1,0 +1,19 @@ +/* + * Copyright 2007 Robert Shearman for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/irot.idl" Added: trunk/reactos/base/services/rpcss/irotp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/irotp.… ============================================================================== --- trunk/reactos/base/services/rpcss/irotp.c (added) +++ trunk/reactos/base/services/rpcss/irotp.c [iso-8859-1] Fri Nov 7 04:52:49 2008 @@ -1,0 +1,379 @@ +/* + * Running Object Table + * + * Copyright 2007 Robert Shearman + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <string.h> + +#include "winerror.h" +#include "windef.h" +#include "winbase.h" + +#include "irot_s.h" + +#include "wine/list.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(rpcss); + +/* define the structure of the running object table elements */ +struct rot_entry +{ + struct list entry; + InterfaceData *object; /* marshaled running object*/ + InterfaceData *moniker; /* marshaled moniker that identifies this object */ + MonikerComparisonData *moniker_data; /* moniker comparison data that identifies this object */ + DWORD cookie; /* cookie identifying this object */ + FILETIME last_modified; + LONG refs; +}; + +static struct list RunningObjectTable = LIST_INIT(RunningObjectTable); + +static CRITICAL_SECTION csRunningObjectTable; +static CRITICAL_SECTION_DEBUG critsect_debug = +{ + 0, 0, &csRunningObjectTable, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": csRunningObjectTable") } +}; +static CRITICAL_SECTION csRunningObjectTable = { &critsect_debug, -1, 0, 0, 0, 0 }; + +static LONG last_cookie = 1; + +static inline void rot_entry_release(struct rot_entry *rot_entry) +{ + if (!InterlockedDecrement(&rot_entry->refs)) + { + HeapFree(GetProcessHeap(), 0, rot_entry->object); + HeapFree(GetProcessHeap(), 0, rot_entry->moniker); + HeapFree(GetProcessHeap(), 0, rot_entry->moniker_data); + HeapFree(GetProcessHeap(), 0, rot_entry); + } +} + +HRESULT IrotRegister( + IrotHandle h, + const MonikerComparisonData *data, + const InterfaceData *obj, + const InterfaceData *mk, + const FILETIME *time, + DWORD grfFlags, + IrotCookie *cookie, + IrotContextHandle *ctxt_handle) +{ + struct rot_entry *rot_entry; + struct rot_entry *existing_rot_entry; + HRESULT hr; + + if (grfFlags & ~(ROTFLAGS_REGISTRATIONKEEPSALIVE|ROTFLAGS_ALLOWANYCLIENT)) + { + WINE_ERR("Invalid grfFlags: 0x%08x\n", grfFlags & ~(ROTFLAGS_REGISTRATIONKEEPSALIVE|ROTFLAGS_ALLOWANYCLIENT)); + return E_INVALIDARG; + } + + rot_entry = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*rot_entry)); + if (!rot_entry) + return E_OUTOFMEMORY; + + rot_entry->refs = 1; + rot_entry->object = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(InterfaceData, abData[obj->ulCntData])); + if (!rot_entry->object) + { + rot_entry_release(rot_entry); + return E_OUTOFMEMORY; + } + rot_entry->object->ulCntData = obj->ulCntData; + memcpy(&rot_entry->object->abData, obj->abData, obj->ulCntData); + + rot_entry->last_modified = *time; + + rot_entry->moniker = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(InterfaceData, abData[mk->ulCntData])); + if (!rot_entry->moniker) + { + rot_entry_release(rot_entry); + return E_OUTOFMEMORY; + } + rot_entry->moniker->ulCntData = mk->ulCntData; + memcpy(&rot_entry->moniker->abData, mk->abData, mk->ulCntData); + + rot_entry->moniker_data = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(MonikerComparisonData, abData[data->ulCntData])); + if (!rot_entry->moniker_data) + { + rot_entry_release(rot_entry); + return E_OUTOFMEMORY; + } + rot_entry->moniker_data->ulCntData = data->ulCntData; + memcpy(&rot_entry->moniker_data->abData, data->abData, data->ulCntData); + + EnterCriticalSection(&csRunningObjectTable); + + hr = S_OK; + + LIST_FOR_EACH_ENTRY(existing_rot_entry, &RunningObjectTable, struct rot_entry, entry) + { + if ((existing_rot_entry->moniker_data->ulCntData == data->ulCntData) && + !memcmp(&data->abData, &existing_rot_entry->moniker_data->abData, data->ulCntData)) + { + hr = MK_S_MONIKERALREADYREGISTERED; + WINE_TRACE("moniker already registered with cookie %d\n", existing_rot_entry->cookie); + break; + } + } + + list_add_tail(&RunningObjectTable, &rot_entry->entry); + + LeaveCriticalSection(&csRunningObjectTable); + + /* gives a registration identifier to the registered object*/ + *cookie = rot_entry->cookie = InterlockedIncrement(&last_cookie); + *ctxt_handle = rot_entry; + + return hr; +} + +HRESULT IrotRevoke( + IrotHandle h, + IrotCookie cookie, + IrotContextHandle *ctxt_handle, + PInterfaceData *obj, + PInterfaceData *mk) +{ + struct rot_entry *rot_entry; + + WINE_TRACE("%d\n", cookie); + + EnterCriticalSection(&csRunningObjectTable); + LIST_FOR_EACH_ENTRY(rot_entry, &RunningObjectTable, struct rot_entry, entry) + { + if (rot_entry->cookie == cookie) + { + HRESULT hr = S_OK; + + list_remove(&rot_entry->entry); + LeaveCriticalSection(&csRunningObjectTable); + + *obj = MIDL_user_allocate(FIELD_OFFSET(InterfaceData, abData[rot_entry->object->ulCntData])); + *mk = MIDL_user_allocate(FIELD_OFFSET(InterfaceData, abData[rot_entry->moniker->ulCntData])); + if (*obj && *mk) + { + (*obj)->ulCntData = rot_entry->object->ulCntData; + memcpy((*obj)->abData, rot_entry->object->abData, (*obj)->ulCntData); + (*mk)->ulCntData = rot_entry->moniker->ulCntData; + memcpy((*mk)->abData, rot_entry->moniker->abData, (*mk)->ulCntData); + } + else + { + MIDL_user_free(*obj); + MIDL_user_free(*mk); + hr = E_OUTOFMEMORY; + } + + rot_entry_release(rot_entry); + *ctxt_handle = NULL; + return hr; + } + } + LeaveCriticalSection(&csRunningObjectTable); + + return E_INVALIDARG; +} + +HRESULT IrotIsRunning( + IrotHandle h, + const MonikerComparisonData *data) +{ + const struct rot_entry *rot_entry; + HRESULT hr = S_FALSE; + + WINE_TRACE("\n"); + + EnterCriticalSection(&csRunningObjectTable); + + LIST_FOR_EACH_ENTRY(rot_entry, &RunningObjectTable, const struct rot_entry, entry) + { + if ((rot_entry->moniker_data->ulCntData == data->ulCntData) && + !memcmp(&data->abData, &rot_entry->moniker_data->abData, data->ulCntData)) + { + hr = S_OK; + break; + } + } + LeaveCriticalSection(&csRunningObjectTable); + + return hr; +} + +HRESULT IrotGetObject( + IrotHandle h, + const MonikerComparisonData *moniker_data, + PInterfaceData *obj, + IrotCookie *cookie) +{ + const struct rot_entry *rot_entry; + + WINE_TRACE("%p\n", moniker_data); + + *cookie = 0; + + EnterCriticalSection(&csRunningObjectTable); + + LIST_FOR_EACH_ENTRY(rot_entry, &RunningObjectTable, const struct rot_entry, entry) + { + HRESULT hr = S_OK; + if ((rot_entry->moniker_data->ulCntData == moniker_data->ulCntData) && + !memcmp(&moniker_data->abData, &rot_entry->moniker_data->abData, moniker_data->ulCntData)) + { + *obj = MIDL_user_allocate(FIELD_OFFSET(InterfaceData, abData[rot_entry->object->ulCntData])); + if (*obj) + { + (*obj)->ulCntData = rot_entry->object->ulCntData; + memcpy((*obj)->abData, rot_entry->object->abData, (*obj)->ulCntData); + + *cookie = rot_entry->cookie; + } + else + hr = E_OUTOFMEMORY; + + LeaveCriticalSection(&csRunningObjectTable); + + return hr; + } + } + + LeaveCriticalSection(&csRunningObjectTable); + + return MK_E_UNAVAILABLE; +} + +HRESULT IrotNoteChangeTime( + IrotHandle h, + IrotCookie cookie, + const FILETIME *last_modified_time) +{ + struct rot_entry *rot_entry; + + WINE_TRACE("%d %p\n", cookie, last_modified_time); + + EnterCriticalSection(&csRunningObjectTable); + LIST_FOR_EACH_ENTRY(rot_entry, &RunningObjectTable, struct rot_entry, entry) + { + if (rot_entry->cookie == cookie) + { + rot_entry->last_modified = *last_modified_time; + LeaveCriticalSection(&csRunningObjectTable); + return S_OK; + } + } + LeaveCriticalSection(&csRunningObjectTable); + + return E_INVALIDARG; +} + +HRESULT IrotGetTimeOfLastChange( + IrotHandle h, + const MonikerComparisonData *moniker_data, + FILETIME *time) +{ + const struct rot_entry *rot_entry; + HRESULT hr = MK_E_UNAVAILABLE; + + WINE_TRACE("%p\n", moniker_data); + + memset(time, 0, sizeof(*time)); + + EnterCriticalSection(&csRunningObjectTable); + LIST_FOR_EACH_ENTRY(rot_entry, &RunningObjectTable, const struct rot_entry, entry) + { + if ((rot_entry->moniker_data->ulCntData == moniker_data->ulCntData) && + !memcmp(&moniker_data->abData, &rot_entry->moniker_data->abData, moniker_data->ulCntData)) + { + *time = rot_entry->last_modified; + hr = S_OK; + break; + } + } + LeaveCriticalSection(&csRunningObjectTable); + + return hr; +} + +HRESULT IrotEnumRunning( + IrotHandle h, + PInterfaceList *list) +{ + const struct rot_entry *rot_entry; + HRESULT hr = S_OK; + ULONG moniker_count = 0; + ULONG i = 0; + + WINE_TRACE("\n"); + + EnterCriticalSection(&csRunningObjectTable); + + LIST_FOR_EACH_ENTRY( rot_entry, &RunningObjectTable, const struct rot_entry, entry ) + moniker_count++; + + *list = MIDL_user_allocate(FIELD_OFFSET(InterfaceList, interfaces[moniker_count])); + if (*list) + { + (*list)->size = moniker_count; + LIST_FOR_EACH_ENTRY( rot_entry, &RunningObjectTable, const struct rot_entry, entry ) + { + (*list)->interfaces[i] = MIDL_user_allocate(FIELD_OFFSET(InterfaceData, abData[rot_entry->moniker->ulCntData])); + if (!(*list)->interfaces[i]) + { + ULONG end = i - 1; + for (i = 0; i < end; i++) + MIDL_user_free((*list)->interfaces[i]); + MIDL_user_free(*list); + hr = E_OUTOFMEMORY; + break; + } + (*list)->interfaces[i]->ulCntData = rot_entry->moniker->ulCntData; + memcpy((*list)->interfaces[i]->abData, rot_entry->moniker->abData, rot_entry->moniker->ulCntData); + i++; + } + } + else + hr = E_OUTOFMEMORY; + + LeaveCriticalSection(&csRunningObjectTable); + + return hr; +} + +void __RPC_USER IrotContextHandle_rundown(IrotContextHandle ctxt_handle) +{ + struct rot_entry *rot_entry = ctxt_handle; + EnterCriticalSection(&csRunningObjectTable); + list_remove(&rot_entry->entry); + LeaveCriticalSection(&csRunningObjectTable); + rot_entry_release(rot_entry); +} + +void * __RPC_USER MIDL_user_allocate(size_t size) +{ + return HeapAlloc(GetProcessHeap(), 0, size); +} + +void __RPC_USER MIDL_user_free(void * p) +{ + HeapFree(GetProcessHeap(), 0, p); +} Propchange: trunk/reactos/base/services/rpcss/irotp.c ------------------------------------------------------------------------------ svn:eol-style = native Removed: trunk/reactos/base/services/rpcss/rpcss.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/rpcss.… ============================================================================== --- trunk/reactos/base/services/rpcss/rpcss.c [iso-8859-1] (original) +++ trunk/reactos/base/services/rpcss/rpcss.c (removed) @@ -1,56 +1,0 @@ -/* - * PROJECT: ReactOS RpcSs service - * LICENSE: GPL - See COPYING in the top level directory - * FILE: services/rpcss/rpcss.c - * PURPOSE: Service initialization - * COPYRIGHT: Copyright 2002 Eric Kohl - */ - -/* INCLUDES *****************************************************************/ - -#include "rpcss.h" - -#define NDEBUG -#include <debug.h> - - - -/* GLOBALS ******************************************************************/ - - - -/* FUNCTIONS *****************************************************************/ - - -VOID CALLBACK -ServiceMain(DWORD argc, LPTSTR *argv) -{ - - DPRINT("ServiceMain() called\n"); - - StartEndpointMapper(); - - DPRINT("ServiceMain() done\n"); -} - - -int main(int argc, char *argv[]) -{ -#if 0 - SERVICE_TABLE_ENTRY ServiceTable[] = {{"RpcSs", ServiceMain},{NULL, NULL}}; -#endif - - DPRINT("RpcSs service\n"); - -#if 0 - StartServiceCtrlDispatcher(ServiceTable); -#endif - - ServiceMain(0, NULL); - - DPRINT("RpcSS: done\n"); - - return 0; -} - -/* EOF */ Modified: trunk/reactos/base/services/rpcss/rpcss.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/rpcss.… ============================================================================== --- trunk/reactos/base/services/rpcss/rpcss.h [iso-8859-1] (original) +++ trunk/reactos/base/services/rpcss/rpcss.h [iso-8859-1] Fri Nov 7 04:52:49 2008 @@ -1,17 +1,26 @@ -#ifndef __RPCSS_H__ -#define __RPCSS_H__ +/* + * RPCSS definitions + * + * Copyright (C) 2002 Greg Turner + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ -#define UNICODE +#ifndef __WINE_RPCSS_H +#define __WINE_RPCSS_H -#include <stdio.h> -#define WIN32_NO_STATUS -#include <windows.h> +#include "windows.h" - -VOID -StartEndpointMapper(VOID); - -#endif /* __RPCSS_H__ */ - -/* EOF */ - +#endif /* __WINE_RPCSS_H */ Modified: trunk/reactos/base/services/rpcss/rpcss.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/rpcss.… ============================================================================== --- trunk/reactos/base/services/rpcss/rpcss.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/services/rpcss/rpcss.rbuild [iso-8859-1] Fri Nov 7 04:52:49 2008 @@ -2,9 +2,23 @@ <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="rpcss" type="win32cui" installbase="system32" installname="rpcss.exe"> <include base="rpcss">.</include> + <include base="rpcss" root="intermediate">.</include> + <library>wine</library> + <library>rpcss_epm_server</library> + <library>rpcss_irot_server</library> + <library>rpcrt4</library> <library>kernel32</library> <library>advapi32</library> - <file>rpcss.c</file> - <file>endpoint.c</file> + <file>rpcss_main.c</file> + <file>epmp.c</file> + <file>irotp.c</file> + <file>epm.idl</file> + <file>irot.idl</file> <file>rpcss.rc</file> </module> +<module name="rpcss_epm_server" type="rpcserver"> + <file>epm.idl</file> +</module> +<module name="rpcss_irot_server" type="rpcserver"> + <file>irot.idl</file> +</module> Added: trunk/reactos/base/services/rpcss/rpcss_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/rpcss_… ============================================================================== --- trunk/reactos/base/services/rpcss/rpcss_main.c (added) +++ trunk/reactos/base/services/rpcss/rpcss_main.c [iso-8859-1] Fri Nov 7 04:52:49 2008 @@ -1,0 +1,144 @@ +/* + * Copyright 2001, Ove KÃ¥ven, TransGaming Technologies Inc. + * Copyright 2002 Greg Turner + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + * ---- rpcss_main.c: + * Initialize and start serving requests. Bail if rpcss already is + * running. + * + * ---- RPCSS.EXE: + * + * Wine needs a server whose role is somewhat like that + * of rpcss.exe in windows. This is not a clone of + * windows rpcss at all. It has been given the same name, however, + * to provide for the possibility that at some point in the future, + * it may become interface compatible with the "real" rpcss.exe on + * Windows. + * + * ---- KNOWN BUGS / TODO: + * + * o Service hooks are unimplemented (if you bother to implement + * these, also implement net.exe, at least for "net start" and + * "net stop" (should be pretty easy I guess, assuming the rest + * of the services API infrastructure works. + * + * o There is a looming problem regarding listening on privileged + * ports. We will need to be able to coexist with SAMBA, and be able + * to function without running winelib code as root. This may + * take some doing, including significant reconceptualization of the + * role of rpcss.exe in wine. + */ + +#include <stdio.h> +#include <limits.h> +#include <assert.h> + +#define NONAMELESSUNION +#define NONAMELESSSTRUCT +#include "rpcss.h" +#include "winnt.h" +#include "irot.h" +#include "epm.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(ole); + +static HANDLE exit_event; + +//extern HANDLE __wine_make_process_system(void); + +static BOOL RPCSS_Initialize(void) +{ + static unsigned short irot_protseq[] = IROT_PROTSEQ; + static unsigned short irot_endpoint[] = IROT_ENDPOINT; + static unsigned short epm_protseq[] = {'n','c','a','c','n','_','n','p',0}; + static unsigned short epm_endpoint[] = {'\\','p','i','p','e','\\','e','p','m','a','p','p','e','r',0}; + static unsigned short epm_protseq_lrpc[] = {'n','c','a','l','r','p','c',0}; + static unsigned short epm_endpoint_lrpc[] = {'e','p','m','a','p','p','e','r',0}; + RPC_STATUS status; + + WINE_TRACE("\n"); + + status = RpcServerRegisterIf(epm_v3_0_s_ifspec, NULL, NULL); + if (status != RPC_S_OK) + return status; + status = RpcServerRegisterIf(Irot_v0_2_s_ifspec, NULL, NULL); + if (status != RPC_S_OK) + { + RpcServerUnregisterIf(epm_v3_0_s_ifspec, NULL, FALSE); + return FALSE; + } + + status = RpcServerUseProtseqEpW(epm_protseq, RPC_C_PROTSEQ_MAX_REQS_DEFAULT, + epm_endpoint, NULL); + if (status != RPC_S_OK) + goto fail; + + status = RpcServerUseProtseqEpW(epm_protseq_lrpc, RPC_C_PROTSEQ_MAX_REQS_DEFAULT, + epm_endpoint_lrpc, NULL); + if (status != RPC_S_OK) + goto fail; + + status = RpcServerUseProtseqEpW(irot_protseq, RPC_C_PROTSEQ_MAX_REQS_DEFAULT, + irot_endpoint, NULL); + if (status != RPC_S_OK) + goto fail; + + status = RpcServerListen(1, RPC_C_LISTEN_MAX_CALLS_DEFAULT, TRUE); + if (status != RPC_S_OK) + goto fail; + + //exit_event = __wine_make_process_system(); + exit_event = CreateEventW(NULL, FALSE, FALSE, NULL); // never fires + + return TRUE; + +fail: + RpcServerUnregisterIf(epm_v3_0_s_ifspec, NULL, FALSE); + RpcServerUnregisterIf(Irot_v0_2_s_ifspec, NULL, FALSE); + return FALSE; +} + +/* returns false if we discover at the last moment that we + aren't ready to terminate */ +static BOOL RPCSS_Shutdown(void) +{ + RpcMgmtStopServerListening(NULL); + RpcServerUnregisterIf(epm_v3_0_s_ifspec, NULL, TRUE); + RpcServerUnregisterIf(Irot_v0_2_s_ifspec, NULL, TRUE); + + CloseHandle(exit_event); + + return TRUE; +} + +int main( int argc, char **argv ) +{ + /* + * We are invoked as a standard executable; we act in a + * "lazy" manner. We register our interfaces and endpoints, and hang around + * until we all user processes exit, and then silently terminate. + */ + + if (RPCSS_Initialize()) { + WaitForSingleObject(exit_event, INFINITE); + RPCSS_Shutdown(); + } + + return 0; +} Propchange: trunk/reactos/base/services/rpcss/rpcss_main.c ------------------------------------------------------------------------------ svn:eol-style = native

15 years, 10 months

[cgutman] 37238: - Fix a memory leak

by cgutman＠svn.reactos.org

Author: cgutman Date: Thu Nov 6 21:46:26 2008 New Revision: 37238 URL: http://svn.reactos.org/svn/reactos?rev=37238&view=rev Log: - Fix a memory leak Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/fileobjs.c Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/fileobjs.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] Thu Nov 6 21:46:26 2008 @@ -387,8 +387,10 @@ switch (AddrFile->Protocol) { case IPPROTO_TCP: TCPFreePort( AddrFile->Port ); - if( AddrFile->Listener ) - TCPClose( AddrFile->Listener ); + if( AddrFile->Listener ) { + TCPClose( AddrFile->Listener ); + ExFreePool( AddrFile->Listener ); + } break; case IPPROTO_UDP:

15 years, 10 months

[cgutman] 37237: - Properly free the connection endpoint

by cgutman＠svn.reactos.org

Author: cgutman Date: Thu Nov 6 20:53:46 2008 New Revision: 37237 URL: http://svn.reactos.org/svn/reactos?rev=37237&view=rev Log: - Properly free the connection endpoint Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/fileobjs.c Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/fileobjs.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] Thu Nov 6 20:53:46 2008 @@ -220,7 +220,7 @@ RemoveEntryList(&Connection->ListEntry); TcpipReleaseSpinLock(&ConnectionEndpointListLock, OldIrql); - ExFreePool(Connection); + TCPFreeConnectionEndpoint(Connection); TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); } @@ -488,20 +488,18 @@ PTDI_REQUEST Request) { PCONNECTION_ENDPOINT Connection; - NTSTATUS Status = STATUS_SUCCESS; TI_DbgPrint(MID_TRACE, ("Called.\n")); Connection = Request->Handle.ConnectionContext; TcpipRecursiveMutexEnter( &TCPLock, TRUE ); - TCPClose(Connection); DeleteConnectionEndpoint(Connection); TcpipRecursiveMutexLeave( &TCPLock ); TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); - return Status; + return STATUS_SUCCESS; }

15 years, 10 months

[tkreuzer] 37236: Add DWARF debug sections to ntoskrnl linker script

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Nov 6 17:05:42 2008 New Revision: 37236 URL: http://svn.reactos.org/svn/reactos?rev=37236&view=rev Log: Add DWARF debug sections to ntoskrnl linker script Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl_amd64.lnk Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl_amd64.lnk URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl_amd64.lnk [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl_amd64.lnk [iso-8859-1] Thu Nov 6 17:05:42 2008 @@ -101,5 +101,69 @@ { [ .stabstr ] } + /* DWARF debug sections. + Symbols in the DWARF debugging sections are relative to the beginning + of the section. Unlike other targets that fake this by putting the + section VMA at 0, the PE format will not allow it. */ + /* DWARF 1.1 and DWARF 2. */ + .debug_aranges BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_aranges) + } + .debug_pubnames BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_pubnames) + } + /* DWARF 2. */ + .debug_info BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_info) *(.gnu.linkonce.wi.*) + } + .debug_abbrev BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_abbrev) + } + .debug_line BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_line) + } + .debug_frame BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_frame) + } + .debug_str BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_str) + } + .debug_loc BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_loc) + } + .debug_macinfo BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_macinfo) + } + /* SGI/MIPS DWARF 2 extensions. */ + .debug_weaknames BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_weaknames) + } + .debug_funcnames BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_funcnames) + } + .debug_typenames BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_typenames) + } + .debug_varnames BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_varnames) + } + /* DWARF 3. */ + .debug_ranges BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_ranges) + } }

15 years, 10 months

[tkreuzer] 37235: Don't strip symbolic information from files. In the near future rsym will convert it into Windows compatible unwind info.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Nov 6 16:55:04 2008 New Revision: 37235 URL: http://svn.reactos.org/svn/reactos?rev=37235&view=rev Log: Don't strip symbolic information from files. In the near future rsym will convert it into Windows compatible unwind info. Modified: branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild Modified: branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/React… ============================================================================== --- branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild [iso-8859-1] Thu Nov 6 16:55:04 2008 @@ -46,7 +46,6 @@ <compilerflag>-Wpointer-arith</compilerflag> <compilerflag>-Wno-uninitialized</compilerflag> <linkerflag>-enable-stdcall-fixup</linkerflag> - <linkerflag>-s</linkerflag> <linkerflag>-static</linkerflag>

15 years, 10 months

[tkreuzer] 37234: Fix scsiport, by using pspec again.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Nov 6 16:50:47 2008 New Revision: 37234 URL: http://svn.reactos.org/svn/reactos?rev=37234&view=rev Log: Fix scsiport, by using pspec again. Added: branches/ros-amd64-bringup/reactos/drivers/storage/scsiport/scsiport.pspec - copied unchanged from r36923, branches/ros-amd64-bringup/reactos/drivers/storage/scsiport/scsiport.pspec branches/ros-amd64-bringup/reactos/drivers/storage/scsiport/stubs.c - copied unchanged from r36923, branches/ros-amd64-bringup/reactos/drivers/storage/scsiport/stubs.c Removed: branches/ros-amd64-bringup/reactos/drivers/storage/scsiport/scsiport.spec Modified: branches/ros-amd64-bringup/reactos/drivers/storage/scsiport/scsiport.rbuild Modified: branches/ros-amd64-bringup/reactos/drivers/storage/scsiport/scsiport.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/storage/scsiport/scsiport.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/storage/scsiport/scsiport.rbuild [iso-8859-1] Thu Nov 6 16:50:47 2008 @@ -3,11 +3,12 @@ <module name="scsiport" type="kernelmodedriver" installbase="system32/drivers" installname="scsiport.sys"> <bootstrap installbase="$(CDOUTPUT)" /> <define name="_SCSIPORT_" /> - <importlibrary definition="scsiport.spec" /> + <importlibrary definition="scsiport.pspec" /> <include base="scsiport">.</include> <library>ntoskrnl</library> <library>hal</library> <file>scsiport.c</file> + <file>stubs.c</file> <file>scsiport.rc</file> - <file>scsiport.spec</file> + <file>scsiport.pspec</file> </module> Removed: branches/ros-amd64-bringup/reactos/drivers/storage/scsiport/scsiport.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/storage/scsiport/scsiport.spec [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/storage/scsiport/scsiport.spec (removed) @@ -1,45 +1,0 @@ -@ cdecl ScsiDebugPrint() -@ stdcall ScsiPortCompleteRequest(ptr long long long long) -@ stdcall ScsiPortConvertPhysicalAddressToUlong(long long) -@ stdcall ScsiPortConvertUlongToPhysicalAddress(long) NTOSKRNL.RtlConvertUlongToLargeInteger -@ stdcall ScsiPortFlushDma(ptr) -@ stdcall ScsiPortFreeDeviceBase(ptr ptr) -@ stdcall ScsiPortGetBusData(ptr long long long ptr long) -@ stdcall ScsiPortGetDeviceBase(ptr long long long long long long) -@ stdcall ScsiPortGetLogicalUnit(ptr long long long) -@ stdcall ScsiPortGetPhysicalAddress(ptr ptr ptr long) -@ stdcall ScsiPortGetSrb(ptr long long long long) -@ stdcall ScsiPortGetUncachedExtension(ptr ptr long) -@ stdcall ScsiPortGetVirtualAddress(ptr long long) -@ stdcall ScsiPortInitialize(ptr ptr ptr ptr) -@ stdcall ScsiPortIoMapTransfer(ptr ptr long long) -@ stdcall ScsiPortLogError(ptr ptr long long long long long) -@ stdcall ScsiPortMoveMemory(ptr ptr long) -@ cdecl ScsiPortNotification() -@ stdcall ScsiPortReadPortBufferUchar(ptr ptr long) HAL.READ_PORT_BUFFER_UCHAR -@ stdcall ScsiPortReadPortBufferUshort(ptr ptr long) HAL.READ_PORT_BUFFER_USHORT -@ stdcall ScsiPortReadPortBufferUlong(ptr ptr long) HAL.READ_PORT_BUFFER_ULONG -@ stdcall ScsiPortReadPortUchar(ptr) HAL.READ_PORT_UCHAR -@ stdcall ScsiPortReadPortUshort(ptr) HAL.READ_PORT_USHORT -@ stdcall ScsiPortReadPortUlong(ptr) HAL.READ_PORT_ULONG -@ stdcall ScsiPortReadRegisterBufferUchar(ptr ptr long) NTOSKRNL.READ_REGISTER_BUFFER_UCHAR -@ stdcall ScsiPortReadRegisterBufferUshort(ptr ptr long) NTOSKRNL.READ_REGISTER_BUFFER_USHORT -@ stdcall ScsiPortReadRegisterBufferUlong(ptr ptr long) NTOSKRNL.READ_REGISTER_BUFFER_ULONG -@ stdcall ScsiPortReadRegisterUchar(ptr) NTOSKRNL.READ_REGISTER_UCHAR -@ stdcall ScsiPortReadRegisterUshort(ptr) NTOSKRNL.READ_REGISTER_USHORT -@ stdcall ScsiPortReadRegisterUlong(ptr) NTOSKRNL.READ_REGISTER_ULONG -@ stdcall ScsiPortSetBusDataByOffset(ptr long long long ptr long long) -@ stdcall ScsiPortStallExecution(long) HAL.KeStallExecutionProcessor -@ stdcall ScsiPortValidateRange(ptr long long long long long long) -@ stdcall ScsiPortWritePortBufferUchar(ptr ptr long) HAL.WRITE_PORT_BUFFER_UCHAR -@ stdcall ScsiPortWritePortBufferUshort(ptr ptr long) HAL.WRITE_PORT_BUFFER_USHORT -@ stdcall ScsiPortWritePortBufferUlong(ptr ptr long) HAL.WRITE_PORT_BUFFER_ULONG -@ stdcall ScsiPortWritePortUchar(ptr long) HAL.WRITE_PORT_UCHAR -@ stdcall ScsiPortWritePortUshort(ptr long) HAL.WRITE_PORT_USHORT -@ stdcall ScsiPortWritePortUlong(ptr long) HAL.WRITE_PORT_ULONG -@ stdcall ScsiPortWriteRegisterBufferUchar(ptr ptr long) NTOSKRNL.WRITE_REGISTER_BUFFER_UCHAR -@ stdcall ScsiPortWriteRegisterBufferUshort(ptr ptr long) NTOSKRNL.WRITE_REGISTER_BUFFER_USHORT -@ stdcall ScsiPortWriteRegisterBufferUlong(ptr ptr long) NTOSKRNL.WRITE_REGISTER_BUFFER_ULONG -@ stdcall ScsiPortWriteRegisterUchar(ptr long) NTOSKRNL.WRITE_REGISTER_UCHAR -@ stdcall ScsiPortWriteRegisterUshort(ptr long) NTOSKRNL.WRITE_REGISTER_USHORT -@ stdcall ScsiPortWriteRegisterUlong(ptr long) NTOSKRNL.WRITE_REGISTER_ULONG

15 years, 10 months

[dreimer] 37233: Hello to three new params on Powershell. Still six are left. Synched the others to the latest changes in the cmd files.

by dreimer＠svn.reactos.org

Author: dreimer Date: Thu Nov 6 16:09:47 2008 New Revision: 37233 URL: http://svn.reactos.org/svn/reactos?rev=37233&view=rev Log: Hello to three new params on Powershell. Still six are left. Synched the others to the latest changes in the cmd files. Added: trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 (with props) trunk/tools/RosBE/RosBE-Windows/Powershell/chdefdir.ps1 (with props) trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 (with props) Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/MinGW.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/MinGW.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/MinGW.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/MinGW.ps1 [iso-8859-1] Thu Nov 6 16:09:47 2008 @@ -21,8 +21,8 @@ $global:_ROSBE_BASEDIR = [System.IO.Path]::GetDirectoryName($0) $global:_ROSBE_MODE = "MinGW" $global:_ROSBE_ORIGINALPATH = "$ENV:PATH" -$global:_ROSBE_HOST_MINGWPATH = "$_ROSBE_BASEDIR\4.1.3" -$global:_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\4.1.3" +$global:_ROSBE_HOST_MINGWPATH = "$_ROSBE_BASEDIR\i386" +$global:_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\i386" "" "" Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Thu Nov 6 16:09:47 2008 @@ -30,8 +30,8 @@ $global:_ROSBE_USECCACHE = 0 $global:_ROSBE_STRIP = 0 $global:_ROSBE_NOSTRIP = 0 -$global:_ROSBE_HOST_MINGWPATH = "$_ROSBE_BASEDIR\4.1.3" -$global:_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\4.1.3" +$global:_ROSBE_HOST_MINGWPATH = "$_ROSBE_BASEDIR\i386" +$global:_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\i386" $global:_ROSBE_LOGDIR = "$_ROSBE_ROSSOURCEDIR\RosBE-Logs" $global:_ROSBE_OBJPATH = $null $global:_ROSBE_OUTPATH = $null Added: trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 (added) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 [iso-8859-1] Thu Nov 6 16:09:47 2008 @@ -1,0 +1,60 @@ +# +# PROJECT: RosBE - ReactOS Build Environment for Windows +# LICENSE: GNU General Public License v2. (see LICENSE.txt) +# FILE: Root/charch.ps1 +# PURPOSE: Tool to change the current Arch to build ROS for in RosBE. +# COPYRIGHT: Copyright 2008 Daniel Reimer <reimer.daniel(a)freenet.de> +# + +$host.ui.RawUI.WindowTitle = "Change the Architecture to build for..." + +# +# Parse the command line arguments. +# ROSBE_ARCH: Default is i386, can be set to amd64, ppc or arm. +# + +# +# Refresh all needed Params by recalling the main Path setting CMD File. +# +function SYSPARAM { + IEX "& '$_ROSBE_BASEDIR\rosbe-gcc-env.ps1'" +} +if ($args[0] -eq $null) { + # + # If Parameters were set, parse them, if not, ask the user to add them. + # + $_1 = Read-Host "Please enter a Architecture you want to build ReactOS for: " + if ($_1 -eq $null) { + "ERROR: You must enter a Architecture." + } +} else { + $_1 = $args +} +if ($_1 -eq "i386") { + $_ROSBE_ARCH = $null + SYSPARAM +} +elseif ($_1 -eq "arm") { + $_ROSBE_ARCH = 1 + SYSPARAM +} +elseif ($_1 -eq "ppc") { + $_ROSBE_ARCH = 2 + SYSPARAM +} +elseif ($_1 -eq "amd64") { + $_ROSBE_ARCH = 3 + SYSPARAM +} +elseif ($_1 -eq $null) { + "Unknown parameter specified. Try 'help [COMMAND]'." +} + +if ($_ROSBE_VERSION -ne $null) { + $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" +} + +# +# Unload all used Vars. +# +$_1 = $null Propchange: trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/tools/RosBE/RosBE-Windows/Powershell/chdefdir.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/chdefdir.ps1 (added) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/chdefdir.ps1 [iso-8859-1] Thu Nov 6 16:09:47 2008 @@ -1,0 +1,46 @@ +# +# PROJECT: RosBE - ReactOS Build Environment for Windows +# LICENSE: GNU General Public License v2. (see LICENSE.txt) +# FILE: Root/chdefdir.cmd +# PURPOSE: Tool to change the current working ReactOS source directory +# in RosBE. +# COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> +# Peter Ward <dralnix(a)gmail.com> +# +# + +$host.ui.RawUI.WindowTitle = "Change the current working ReactOS source directory..." + +# +# Parse the command line arguments. +# +if ($args[0] -eq $null) { + # + # If Parameters were set, parse them, if not, ask the user to add them. + # + $_1 = Read-Host "Please enter a ReactOS source directory, or 'previous': " + if ($_1 -eq $null) { + "ERROR: You must enter a ReactOS source directory, or 'previous'." + } +} else { + $_1 = $args +} +if ($_1 -eq "previous") { + popd +} else { + if (!(Test-Path "$_1\.")) { + "ERROR: The path specified doesn't seem to exist." + + } + pushd "$_1" +} +$global:_ROSBE_ROSSOURCEDIR = "$pwd" + +if ($_ROSBE_VERSION -ne $null) { + $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" +} + +# +# Unload all used Vars. +# +$_1 = $null Propchange: trunk/tools/RosBE/RosBE-Windows/Powershell/chdefdir.ps1 ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 (added) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 [iso-8859-1] Thu Nov 6 16:09:47 2008 @@ -1,0 +1,28 @@ +# +# PROJECT: RosBE - ReactOS Build Environment for Windows +# LICENSE: GNU General Public License v2. (see LICENSE.txt) +# FILE: Root/options.cmd +# PURPOSE: Starts options.exe and restarts RosBE afterwards. +# COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> +# +# + +$host.ui.RawUI.WindowTitle = "Options" + +# +# Run options.exe +# +if (Test-Path "$_ROSBE_BASEDIR\Tools\options.exe") { + pushd "$_ROSBE_BASEDIR" + & "$_ROSBE_BASEDIR\Tools\options.exe" + popd + if (Test-Path "$ENV:APPDATA\RosBE\rosbe-options.cmd") { + & "$ENV:APPDATA\RosBE\rosbe-options.cmd" + } +} else { + "ERROR: options.exe was not found." +} + +if ($_ROSBE_VERSION -ne $null) { + $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" +} Propchange: trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] Thu Nov 6 16:09:47 2008 @@ -28,17 +28,17 @@ if ($_ROSBE_ARCH -eq 1) { $ENV:ROS_ARCH = "arm" $ENV:ROS_PREFIX = "arm-pc-mingw32" - $_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\4.4.0" + $_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\arm" } if ($_ROSBE_ARCH -eq 2) { $ENV:ROS_ARCH = "ppc" $ENV:ROS_PREFIX = "ppc-pc-mingw32" - $_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\4.4.0" + $_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\ppc" } if ($_ROSBE_ARCH -eq 3) { $ENV:ROS_ARCH = "amd64" $ENV:ROS_PREFIX = "x86_64-pc-mingw32" - $_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\4.4.0" + $_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\x86_64" } #

15 years, 10 months

[dreimer] 37232: OK, finally found the reason for some strange errors. Thx to d0g and Colin Finck for finding the reason.

by dreimer＠svn.reactos.org

Author: dreimer Date: Thu Nov 6 15:13:20 2008 New Revision: 37232 URL: http://svn.reactos.org/svn/reactos?rev=37232&view=rev Log: OK, finally found the reason for some strange errors. Thx to d0g and Colin Finck for finding the reason. Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd trunk/tools/RosBE/RosBE-Windows/Root/update.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Bui… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd [iso-8859-1] Thu Nov 6 15:13:20 2008 @@ -62,9 +62,7 @@ set HOST_CC=ccache gcc set HOST_CPP=ccache g++ - :: - ::Target defaults to host(i386) - :: + REM Target defaults to host(i386) set TARGET_CC=ccache gcc set TARGET_CPP=ccache g++ @@ -84,9 +82,7 @@ set HOST_CC=gcc set HOST_CPP=g++ - :: - ::Target defaults to host(i386) - :: + REM Target defaults to host(i386) set TARGET_CC=gcc set TARGET_CPP=g++ @@ -162,51 +158,56 @@ goto :EOC :BUILD - if %_ROSBE_SHOWTIME% == 1 ( - if %_ROSBE_WRITELOG% == 1 ( - "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" %* 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" - ) else ( - "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" %* - ) - ) else ( - if %_ROSBE_WRITELOG% == 1 ( - "%_ROSBE_MINGWMAKE%" %* 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" - ) else ( - "%_ROSBE_MINGWMAKE%" %* - ) - ) + +if %_ROSBE_SHOWTIME% == 1 ( + if %_ROSBE_WRITELOG% == 1 ( + "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" %* 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" + ) else ( + "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" %* + ) +) else ( + if %_ROSBE_WRITELOG% == 1 ( + "%_ROSBE_MINGWMAKE%" %* 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" + ) else ( + "%_ROSBE_MINGWMAKE%" %* + ) +) goto :EOF +:: +:: Get the number of CPUs in the system so we know how many jobs to execute. +:: To modify the number used alter the options used with cpucount: +:: No Option - Number of CPUs. +:: -x1 - Number of CPUs, plus 1. +:: -x2 - Number of CPUs, doubled. +:: -a - Determine the cpu count based on the inherited process affinity mask. +:: + :BUILDMULTI - :: - :: Get the number of CPUs in the system so we know how many jobs to execute. - :: To modify the number used alter the options used with cpucount: - :: No Option - Number of CPUs. - :: -x1 - Number of CPUs, plus 1. - :: -x2 - Number of CPUs, doubled. - :: -a - Determine the cpu count based on the inherited process affinity mask. - :: - for /f "usebackq" %%i in (`"%_ROSBE_BASEDIR%\Tools\cpucount.exe" -x1`) do set CPUCOUNT=%%i - - if %_ROSBE_SHOWTIME% == 1 ( - if %_ROSBE_WRITELOG% == 1 ( - "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" - ) else ( - "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 - ) - ) else ( - if %_ROSBE_WRITELOG% == 1 ( - "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" - ) else ( - "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 - ) - ) + +for /f "usebackq" %%i in (`"%_ROSBE_BASEDIR%\Tools\cpucount.exe" -x1`) do set CPUCOUNT=%%i + +if %_ROSBE_SHOWTIME% == 1 ( + if %_ROSBE_WRITELOG% == 1 ( + "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" + ) else ( + "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 + ) +) else ( + if %_ROSBE_WRITELOG% == 1 ( + "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" + ) else ( + "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 + ) +) goto :EOF +:: +:: Highlight the fact that building has ended. +:: + :EOC -:: -:: Highlight the fact that building has ended. -:: + "%_ROSBE_BASEDIR%\Tools\flash.exe" if defined _ROSBE_VERSION ( Modified: trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cle… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd [iso-8859-1] Thu Nov 6 15:13:20 2008 @@ -33,10 +33,12 @@ goto :EOC ) -:LOG :: :: Check if we have any logs to clean, if so, clean them. :: + +:LOG + if exist "%_ROSBE_LOGDIR%\*.txt" ( echo Cleaning build logs... del /f "%_ROSBE_LOGDIR%\*.txt" 1> NUL 2> NUL @@ -46,17 +48,15 @@ ) goto :EOF +:: +:: Check if we have something to clean, if so, clean it. +:: + :DEL if .%ROS_ARCH%. == .arm. ( - :: - :: Check if we have something to clean, if so, clean it. - :: if exist "obj-arm\." ( echo Cleaning ReactOS ARM source directory... - :: - : Remove directories created by the build. - :: if exist "obj-arm\." ( rd /s /q "obj-arm" 1> NUL 2> NUL ) @@ -73,14 +73,8 @@ goto :ROS ) if .%ROS_ARCH%. == .ppc. ( - :: - :: Check if we have something to clean, if so, clean it. - :: if exist "obj-ppc\." ( echo Cleaning ReactOS PPC source directory... - :: - : Remove directories created by the build. - :: if exist "obj-ppc\." ( rd /s /q "obj-ppc" 1> NUL 2> NUL ) @@ -97,14 +91,8 @@ goto :ROS ) if .%ROS_ARCH%. == .amd64. ( - :: - :: Check if we have something to clean, if so, clean it. - :: if exist "obj-amd64\." ( echo Cleaning ReactOS X86_64 source directory... - :: - : Remove directories created by the build. - :: if exist "obj-amd64\." ( rd /s /q "obj-amd64" 1> NUL 2> NUL ) @@ -121,14 +109,8 @@ goto :ROS ) -:: -:: Check if we have something to clean, if so, clean it. -:: if exist "obj-i386\." ( echo Cleaning ReactOS i386 source directory... - :: - : Remove directories created by the build. - :: if exist "obj-i386\." ( rd /s /q "obj-i386" 1> NUL 2> NUL ) @@ -144,13 +126,14 @@ ) :ROS + if exist "reactos\." ( rd /s /q "reactos" 1> NUL 2> NUL ) - goto :EOF :EOC + if defined _ROSBE_VERSION ( title ReactOS Build Environment %_ROSBE_VERSION% ) Modified: trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Con… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd [iso-8859-1] Thu Nov 6 15:13:20 2008 @@ -26,6 +26,7 @@ goto :NOK :CONT + if exist "config.rbuild" ( del "config.rbuild" echo Main Configuration File was found and deleted. @@ -47,7 +48,9 @@ set /p YESNO="(yes), (no)" if /i "%YESNO%"=="yes" goto :CONT2 if /i "%YESNO%"=="no" goto :NOK + :CONT2 + del "%_ROSBE_BASEDIR%\*.rbuild" del "config.rbuild" copy "config.template.rbuild" "%APPDATA%\RosBE\config.rbuild" @@ -248,6 +251,7 @@ goto :NOK :NOK + if defined _ROSBE_VERSION ( title ReactOS Build Environment %_ROSBE_VERSION% ) Modified: trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Hel… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd [iso-8859-1] Thu Nov 6 15:13:20 2008 @@ -254,6 +254,7 @@ ) :EOC + if defined _ROSBE_VERSION ( title ReactOS Build Environment %_ROSBE_VERSION% ) Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] Thu Nov 6 15:13:20 2008 @@ -92,12 +92,13 @@ cls call :RosBE4 -:EndCommandParse - :: :: Load the base directory from srclist.txt and set it as the :: new source directory. :: + +:EndCommandParse + if exist "%_ROSBE_BASEDIR%\scut.cmd" ( call "%_ROSBE_BASEDIR%\scut.cmd" ) @@ -134,36 +135,41 @@ :: Display the banner and set up the environment for the GCC 4.x.x build :: environment. :: + :RosBE4 - echo ******************************************************************************* - echo * * - echo * ReactOS Build Environment %_ROSBE_VERSION% * - echo * * - echo ******************************************************************************* - echo. - echo. - ver - :: - :: Set the correct path for the build tools and set the MinGW make. - :: - call "%_ROSBE_BASEDIR%\rosbe-gcc-env.cmd" + +echo ******************************************************************************* +echo * * +echo * ReactOS Build Environment %_ROSBE_VERSION% * +echo * * +echo ******************************************************************************* +echo. +echo. +ver + +:: +:: Set the correct path for the build tools and set the MinGW make. +:: +call "%_ROSBE_BASEDIR%\rosbe-gcc-env.cmd" goto :EOF :: :: Load the doskey macros and delete any macros for components :: that are not actually present. :: + :LOADDOSKEYMACROS - doskey /macrofile="%_ROSBE_BASEDIR%\RosBE.mac" - if not exist "%_ROSBE_BASEDIR%\chdefdir.cmd" ( doskey CHDEFDIR= ) - if not exist "%_ROSBE_BASEDIR%\chdefgcc.cmd" ( doskey CHDEFGCC= ) - if not exist "%_ROSBE_BASEDIR%\charch.cmd" ( doskey CHARCH= ) - if not exist "%_ROSBE_BASEDIR%\Config.cmd" ( doskey CONFIG= ) - if not exist "%_ROSBE_BASEDIR%\reladdr2line.cmd" ( doskey RADDR2LINE= ) - if not exist "%_ROSBE_BASEDIR%\scut.cmd" ( doskey SCUT= ) - if not exist "%_ROSBE_BASEDIR%\sSVN.cmd" ( doskey SSVN= ) - if not exist "%_ROSBE_BASEDIR%\sSVN.cmd" ( doskey SVN= ) - if not exist "%_ROSBE_BASEDIR%\update.cmd" ( doskey UPDATE= ) - if not exist "%_ROSBE_BASEDIR%\options.cmd" ( doskey OPTIONS= ) +doskey /macrofile="%_ROSBE_BASEDIR%\RosBE.mac" + +if not exist "%_ROSBE_BASEDIR%\chdefdir.cmd" ( doskey CHDEFDIR= ) +if not exist "%_ROSBE_BASEDIR%\chdefgcc.cmd" ( doskey CHDEFGCC= ) +if not exist "%_ROSBE_BASEDIR%\charch.cmd" ( doskey CHARCH= ) +if not exist "%_ROSBE_BASEDIR%\Config.cmd" ( doskey CONFIG= ) +if not exist "%_ROSBE_BASEDIR%\reladdr2line.cmd" ( doskey RADDR2LINE= ) +if not exist "%_ROSBE_BASEDIR%\scut.cmd" ( doskey SCUT= ) +if not exist "%_ROSBE_BASEDIR%\sSVN.cmd" ( doskey SSVN= ) +if not exist "%_ROSBE_BASEDIR%\sSVN.cmd" ( doskey SVN= ) +if not exist "%_ROSBE_BASEDIR%\update.cmd" ( doskey UPDATE= ) +if not exist "%_ROSBE_BASEDIR%\options.cmd" ( doskey OPTIONS= ) goto :EOF Modified: trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd [iso-8859-1] Thu Nov 6 15:13:20 2008 @@ -44,26 +44,31 @@ goto :EOC ) -:EOA - :: :: Refresh all needed Params by recalling the main Path setting CMD File. :: + +:EOA + call "%_ROSBE_BASEDIR%\rosbe-gcc-env.cmd" goto :EOC + :: :: If Parameters were set, parse them, if not, ask the user to add them. :: + :INTERACTIVE - set /p _1="Please enter a Architecture you want to build ReactOS for: " - if "%_1%" == "" ( - echo ERROR: You must enter a Architecture. - goto :EOC - ) + +set /p _1="Please enter a Architecture you want to build ReactOS for: " +if "%_1%" == "" ( + echo ERROR: You must enter a Architecture. + goto :EOC +) goto :EOF :EOC + if defined _ROSBE_VERSION ( title ReactOS Build Environment %_ROSBE_VERSION% ) Modified: trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/chd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd [iso-8859-1] Thu Nov 6 15:13:20 2008 @@ -39,15 +39,18 @@ :: :: If Parameters were set, parse them, if not, ask the user to add them. :: + :INTERACTIVE - set /p _1="Please enter a ReactOS source directory, or 'previous': " - if "%_1%" == "" ( - echo ERROR: You must enter a ReactOS source directory, or 'previous'. - goto :EOC - ) + +set /p _1="Please enter a ReactOS source directory, or 'previous': " +if "%_1%" == "" ( + echo ERROR: You must enter a ReactOS source directory, or 'previous'. + goto :EOC +) goto :EOF :EOC + if defined _ROSBE_VERSION ( title ReactOS Build Environment %_ROSBE_VERSION% ) Modified: trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/chd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd [iso-8859-1] Thu Nov 6 15:13:20 2008 @@ -55,23 +55,26 @@ ) :EOA + call "%_ROSBE_BASEDIR%\rosbe-gcc-env.cmd" chdefgcc goto :EOC :INTERACTIVE - set /p _1="Please enter a MinGW/GCC directory (don't use quotes): " - if "%_1%" == "" ( - echo ERROR: You must enter a MinGW/GCC directory. - goto :EOC - ) - set /p _2="Please specify, if this will be the Target or Host GCC: " - if "%_2%" == "" ( - echo ERROR: You must enter "target" or "host". - goto :EOC - ) + +set /p _1="Please enter a MinGW/GCC directory (don't use quotes): " +if "%_1%" == "" ( + echo ERROR: You must enter a MinGW/GCC directory. + goto :EOC +) +set /p _2="Please specify, if this will be the Target or Host GCC: " +if "%_2%" == "" ( + echo ERROR: You must enter "target" or "host". + goto :EOC +) goto :EOF :EOC + if defined _ROSBE_VERSION ( title ReactOS Build Environment %_ROSBE_VERSION% ) Modified: trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/rel… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd [iso-8859-1] Thu Nov 6 15:13:20 2008 @@ -38,37 +38,41 @@ :: adress and can be given directly to raddr2line. If not, add it and :: give the result to raddr2line. :: + :RADD2RLINE - if "%_1%" == "" ( - echo ERROR: You must specify a path/file to examine. - goto :EOC - ) - if "%_2%" == "" ( - echo ERROR: You must specify a address to analyze. - goto :EOC - ) - echo %_1% - for /f "tokens=2" %%i in ('"objdump -p %_1% 2>NUL | findstr ImageBase"') do set baseaddr=0x%%i - if %%i lss %_2% ( - "%_ROSBE_BASEDIR%\Tools\raddr2line.exe" "%_1%" "%_2%" - ) else ( - set /a baseaddr+=0x%_2% - for /f %%i in ('""%_ROSBE_BASEDIR%\Tools\echoh.exe" %baseaddr%"') do set relbase=%%i - "%_ROSBE_BASEDIR%\Tools\raddr2line.exe" "%_1%" "%relbase%" - ) + +if "%_1%" == "" ( + echo ERROR: You must specify a path/file to examine. + goto :EOC +) +if "%_2%" == "" ( + echo ERROR: You must specify a address to analyze. + goto :EOC +) +echo %_1% +for /f "tokens=2" %%i in ('"objdump -p %_1% 2>NUL | findstr ImageBase"') do set baseaddr=0x%%i +if %%i lss %_2% ( + "%_ROSBE_BASEDIR%\Tools\raddr2line.exe" "%_1%" "%_2%" +) else ( + set /a baseaddr+=0x%_2% + for /f %%i in ('""%_ROSBE_BASEDIR%\Tools\echoh.exe" %baseaddr%"') do set relbase=%%i + "%_ROSBE_BASEDIR%\Tools\raddr2line.exe" "%_1%" "%relbase%" +) goto :EOC :: :: If Parameters were set, parse them, if not, ask the user to add them. :: + :INTERACTIVE - if "%_1%" == "" ( - set /p _1="Please enter the path/file to be examined: " - call :CHECKPATH - ) - if "%_2%" == "" ( - set /p _2="Please enter the address you would like to analyze: " - ) + +if "%_1%" == "" ( + set /p _1="Please enter the path/file to be examined: " + call :CHECKPATH +) +if "%_2%" == "" ( + set /p _2="Please enter the address you would like to analyze: " +) goto :EOF :: @@ -76,14 +80,17 @@ :: the specified file in the current directory and any :: sub-directories. :: + :CHECKPATH - "%_ROSBE_BASEDIR%\Tools\chkslash.exe" %_1% - if errorlevel 2 ( - for /f "usebackq" %%i in (`"dir /a:-d /s /b %_1% 2>NUL | findstr "%_1%""`) do set _1=%%i - ) + +"%_ROSBE_BASEDIR%\Tools\chkslash.exe" %_1% +if errorlevel 2 ( + for /f "usebackq" %%i in (`"dir /a:-d /s /b %_1% 2>NUL | findstr "%_1%""`) do set _1=%%i +) goto :EOF :EOC + if defined _ROSBE_VERSION ( title ReactOS Build Environment %_ROSBE_VERSION% ) Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] Thu Nov 6 15:13:20 2008 @@ -26,7 +26,6 @@ :: :: Set the Arch Variables :: - set ROS_ARCH= set ROS_PREFIX= @@ -50,11 +49,12 @@ set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\x86_64 ) -:main - :: :: Set up the GCC 4.x.x build environment. :: + +:main + set PATH=%_ROSBE_HOST_MINGWPATH%\bin;%_ROSBE_TARGET_MINGWPATH%\bin;%_ROSBE_ORIGINALPATH% set _ROSBE_MINGWMAKE=%_ROSBE_HOST_MINGWPATH%\bin\mingw32-make.exe Modified: trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/sSV… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd [iso-8859-1] Thu Nov 6 15:13:20 2008 @@ -19,6 +19,7 @@ echo No parameter specified. Try 'help [COMMAND]'. goto :EOC ) + :: :: These two are directly parsed to svn. :: @@ -40,10 +41,10 @@ "%_ROSBE_BASEDIR%\Tools\svn.exe" cleanup goto :EOC ) + :: :: Check if the folder is empty. If not, output an error. :: - if /i "%1" == "create" ( title SVN Creating... if exist ".svn\." ( @@ -58,6 +59,7 @@ ) goto :EOC ) + :: :: Output the revision of the local and online trees and tell the user if :: its up to date or not. @@ -78,6 +80,7 @@ ) :UP + echo Local Revision: %OFFSVN% echo Online HEAD Revision: %ONSVN% echo. @@ -91,11 +94,13 @@ ) :UP2 + set /p UP="Please enter 'yes' or 'no': " if /i "%UP%"=="yes" "%_ROSBE_BASEDIR%\ssvn" update if /i "%UP%"=="no" goto :EOC :EOC + if defined _ROSBE_VERSION ( title ReactOS Build Environment %_ROSBE_VERSION% ) Modified: trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/scu… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd [iso-8859-1] Thu Nov 6 15:13:20 2008 @@ -35,9 +35,11 @@ goto :EOC :paramcall + call "%_ROSBE_BASEDIR%\Tools\scut.exe" "%1" %2 %3 :EOC + if defined _ROSBE_VERSION ( title ReactOS Build Environment %_ROSBE_VERSION% ) Modified: trunk/tools/RosBE/RosBE-Windows/Root/update.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/upd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] Thu Nov 6 15:13:20 2008 @@ -16,6 +16,7 @@ if %_ROSBE_DEBUG% == 1 ( @echo on ) + :: :: Set Title :: @@ -110,9 +111,9 @@ cd /d "%_ROSBE_BASEDIR%" if %_ROSBE_CMDS% == yes ( - :: - :: First check for a new Updater - :: + + REM First check for a new Updater + for %%F in (update.cmd) do set _ROSBE_UPDDATE=%%~tF "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/update.cmd for %%F in (update.cmd) do set _ROSBE_UPDDATE2=%%~tF @@ -122,9 +123,9 @@ echo Updater got updated and needs to be restarted. goto :EOU ) - :: - :: PS1 Files. - :: + + REM PS1 Files. + if exist "Build.ps1" ( "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/Build.ps1 ) @@ -144,37 +145,32 @@ "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/rosbe-gcc-env.ps1 ) - :: - :: Options Files. - :: + REM Options Files. + if exist "options.cmd" ( "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/options.cmd ) - :: - :: SVN Files. - :: + REM SVN Files. + if exist "sSVN.cmd" ( "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/sSVN.cmd ) - :: - :: SCut Files. - :: + REM SCut Files. + if exist "scut.cmd" ( "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/scut.cmd ) - :: - :: RelAddr2Line Files. - :: + REM RelAddr2Line Files. + if exist "reladdr2line.cmd" ( "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/reladdr2line.cmd ) - :: - :: Other Tools Files. - :: + REM Other Tools Files. + if exist "Config.cmd" ( "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/Config.cmd ) @@ -182,9 +178,8 @@ "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/chdefdir.cmd ) - :: - :: Default Files. - :: + REM Default Files. + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/Build.cmd "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/ChangeLog.txt "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/chdefgcc.cmd @@ -203,47 +198,44 @@ ) if %_ROSBE_GCC% == yes ( - :: - :: Add Dates into Vars and load GCC packages if needed. - :: + + REM Add Dates into Vars and load GCC packages if needed. + if exist GCC.7z ( for %%F in (GCC.7z) do set _ROSBE_GCCDATE=%%~tF ) "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/GCC.7z - :: - :: Add the maybe Updated Dates to another Var. - :: + REM Add the maybe Updated Dates to another Var. + for %%F in (GCC.7z) do set _ROSBE_GCCDATE2=%%~tF - :: - :: Extract GCC. - :: + REM Extract GCC. + if !_ROSBE_GCCDATE! NEQ !_ROSBE_GCCDATE2! ( "Tools\7z.exe" x GCC.7z "%_ROSBE_BASEDIR%\i386" ) ) if %_ROSBE_TOOLS% == yes ( - :: - :: Add Dates into Vars and load Tool SRC packages if needed. - :: + + REM Add Dates into Vars and load Tool SRC packages if needed. + if exist Tools.7z ( for %%F in (Tools.7z) do set _ROSBE_TOOLSDATE=%%~tF ) "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/Tools.7z - :: - :: Add the maybe Updated Dates to another Var. - :: + REM Add the maybe Updated Dates to another Var. + for %%F in (Tools.7z) do set _ROSBE_TOOLSDATE2=%%~tF if !_ROSBE_TOOLSDATE! NEQ !_ROSBE_TOOLSDATE2! ( "Tools\7z.exe" x Tools.7z "%TEMP%" - :: - :: Build the tools - :: + + REM Build the tools + make -f %TEMP%\makefile copy %TEMP%\*.exe "%_ROSBE_BASEDIR%\Tools" ) @@ -252,6 +244,10 @@ :EOU cd /d "%_ROSBE_OPATH%" + +if defined _ROSBE_VERSION ( + title ReactOS Build Environment %_ROSBE_VERSION% +) :: :: Unload Vars. @@ -267,8 +263,3 @@ set _ROSBE_OPATH= set _ROSBE_UPDDATE= set _ROSBE_UPDDATE2= - - -if defined _ROSBE_VERSION ( - title ReactOS Build Environment %_ROSBE_VERSION% -)

15 years, 10 months

← Newer
1
...
53
54
55
56
57
58
59
...
66
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 November 2008