Ros-diffs August 2005

ros-diffs@reactos.org

23 participants
669 discussions

[sedwards] 17288: remove ros specific functions from public header
by sedwards＠svn.reactos.com 11 Aug '05

11 Aug '05

remove ros specific functions from public header Modified: trunk/reactos/w32api/include/ddk/winddk.h _____ Modified: trunk/reactos/w32api/include/ddk/winddk.h --- trunk/reactos/w32api/include/ddk/winddk.h 2005-08-11 15:55:25 UTC (rev 17287) +++ trunk/reactos/w32api/include/ddk/winddk.h 2005-08-11 17:27:13 UTC (rev 17288) @@ -9838,16 +9838,6 @@ IN ULONG Level, IN BOOLEAN State); -NTOSAPI -BOOLEAN -DDKAPI -KeRosPrintAddress ( PVOID address ); - -NTOSAPI -VOID -DDKAPI -KeRosDumpStackFrames ( PULONG Frame, ULONG FrameCount ); - #ifdef DBG #define KdPrint(_x_) DbgPrint _x_

1 0

[amunger] 17287: Added TimeOut to the correct section, removed ion's 12148 incorrect addition. 10 second default.
by amunger＠svn.reactos.com 11 Aug '05

11 Aug '05

Added TimeOut to the correct section, removed ion's 12148 incorrect addition. 10 second default. Modified: trunk/reactos/subsys/system/usetup/bootsup.c _____ Modified: trunk/reactos/subsys/system/usetup/bootsup.c --- trunk/reactos/subsys/system/usetup/bootsup.c 2005-08-11 15:10:01 UTC (rev 17286) +++ trunk/reactos/subsys/system/usetup/bootsup.c 2005-08-11 15:55:25 UTC (rev 17287) @@ -50,14 +50,12 @@ L"DefaultOS", L"ReactOS"); -#if 0 /* Timeout=10 */ IniCacheInsertKey(IniSection, NULL, INSERT_LAST, L"TimeOut", L"10"); -#endif /* Create "Display" section */ IniSection = IniCacheAppendSection(IniCache, @@ -167,13 +165,6 @@ INSERT_LAST, L"SelectedColor", L"Gray"); - - /* TimeOut=5 */ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"TimeOut", - L"5"); }

1 0

[gvg] 17286: Alexandre Julliard <julliard@winehq.org>
by gvg＠svn.reactos.com 11 Aug '05

11 Aug '05

Alexandre Julliard <julliard(a)winehq.org> - Added support for HTML resource type. Mike McCormack <mike(a)codeweavers.com> - gcc 4.0 -Wpointer-sign fixes. Stefan Huehner <stefan(a)huehner.org> - Fix some -Wsign-compare warnings. Jacek Caban <jack(a)itma.pwr.wroc.pl> - '.' is a valid char of tIDENT. Marcus Meissner <marcus(a)jet.franken.de> - Fixed signedness warnings. Modified: trunk/reactos/tools/wrc/dumpres.c Modified: trunk/reactos/tools/wrc/genres.c Modified: trunk/reactos/tools/wrc/genres.h Modified: trunk/reactos/tools/wrc/lex.yy.c Modified: trunk/reactos/tools/wrc/newstruc.c Modified: trunk/reactos/tools/wrc/newstruc.h Modified: trunk/reactos/tools/wrc/parser.l Modified: trunk/reactos/tools/wrc/parser.y Modified: trunk/reactos/tools/wrc/readres.c Modified: trunk/reactos/tools/wrc/wrctypes.h Modified: trunk/reactos/tools/wrc/writeres.c Modified: trunk/reactos/tools/wrc/y.tab.c Modified: trunk/reactos/tools/wrc/y.tab.h _____ Modified: trunk/reactos/tools/wrc/dumpres.c --- trunk/reactos/tools/wrc/dumpres.c 2005-08-11 12:23:51 UTC (rev 17285) +++ trunk/reactos/tools/wrc/dumpres.c 2005-08-11 15:10:01 UTC (rev 17286) @@ -78,13 +78,13 @@ * Remarks : No codepage translation is done. ************************************************************************ ***** */ -static char *strncpyWtoA(char *cs, WCHAR *ws, int maxlen) +static char *strncpyWtoA(char *cs, const WCHAR *ws, int maxlen) { char *cptr = cs; - WCHAR *wsMax = ws + maxlen - 1; + const WCHAR *wsMax = ws + maxlen - 1; while(*ws && ws < wsMax) { - if((short)*ws < -128 || (short)*ws > 127) + if(*ws > 255) fprintf(stderr, "***Warning: Unicode string contains non-printable chars***\n"); *cptr++ = (char)*ws++; } _____ Modified: trunk/reactos/tools/wrc/genres.c --- trunk/reactos/tools/wrc/genres.c 2005-08-11 12:23:51 UTC (rev 17285) +++ trunk/reactos/tools/wrc/genres.c 2005-08-11 15:10:01 UTC (rev 17286) @@ -62,7 +62,7 @@ return r; } -res_t *grow_res(res_t *r, int add) +res_t *grow_res(res_t *r, unsigned int add) { r->allocsize += add; r->data = (char *)xrealloc(r->data, r->allocsize); @@ -416,7 +416,7 @@ */ static void put_raw_data(res_t *res, raw_data_t *raw, int offset) { - int wsize = raw->size - offset; + unsigned int wsize = raw->size - offset; if(res->allocsize - res->size < wsize) grow_res(res, wsize); memcpy(&(res->data[res->size]), raw->data + offset, wsize); @@ -1350,6 +1350,35 @@ /* ************************************************************************ ***** + * Function : html2res + * Syntax : res_t *html2res(name_id_t *name, html_t *html) + * Input : + * name - Name/ordinal of the resource + * rdt - The html descriptor + * Output : New .res format structure + * Description : + * Remarks : + ************************************************************************ ***** +*/ +static res_t *html2res(name_id_t *name, html_t *html) +{ + int restag; + res_t *res; + assert(name != NULL); + assert(html != NULL); + + res = new_res(); + restag = put_res_header(res, WRC_RT_HTML, NULL, name, html->memopt, &(html->data->lvc)); + put_raw_data(res, html->data, 0); + /* Set ResourceSize */ + SetResSize(res, restag); + if(win32) + put_pad(res); + return res; +} + +/* + ************************************************************************ ***** * Function : rcdata2res * Syntax : res_t *rcdata2res(name_id_t *name, rcdata_t *rdt) * Input : @@ -1941,6 +1970,10 @@ if(!top->binres) top->binres = menuex2res(top->name, top->res.menex); break; + case res_html: + if(!top->binres) + top->binres = html2res(top->name, top->res.html); + break; case res_rdt: if(!top->binres) top->binres = rcdata2res(top->name, top->res.rdt); _____ Modified: trunk/reactos/tools/wrc/genres.h --- trunk/reactos/tools/wrc/genres.h 2005-08-11 12:23:51 UTC (rev 17285) +++ trunk/reactos/tools/wrc/genres.h 2005-08-11 15:10:01 UTC (rev 17286) @@ -24,7 +24,7 @@ #include "wrctypes.h" res_t *new_res(void); -res_t *grow_res(res_t *r, int add); +res_t *grow_res(res_t *r, unsigned int add); void put_byte(res_t *res, unsigned c); void put_word(res_t *res, unsigned w); void put_dword(res_t *res, unsigned d); _____ Modified: trunk/reactos/tools/wrc/lex.yy.c --- trunk/reactos/tools/wrc/lex.yy.c 2005-08-11 12:23:51 UTC (rev 17285) +++ trunk/reactos/tools/wrc/lex.yy.c 2005-08-11 15:10:01 UTC (rev 17286) @@ -311,13 +311,13 @@ 26, 26, 26, 26, 26, 26, 31, 32, 33, 34, 34, 34, 34, 34, 34, 34, 34, 34, 26, 35, - 26, 26, 26, 26, 26, 36, 36, 36, 36, 36, - 36, 36, 36, 36, 36, 36, 37, 36, 36, 36, - 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, - 36, 26, 31, 26, 26, 36, 26, 36, 36, 36, - 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, - 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, - 36, 36, 36, 38, 26, 39, 26, 26, 26, 26, + 26, 26, 26, 26, 26, 31, 31, 31, 31, 31, + 31, 31, 31, 31, 31, 31, 36, 31, 31, 31, + 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, + 31, 26, 37, 26, 26, 31, 26, 31, 31, 31, + 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, + 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, + 31, 31, 31, 38, 26, 39, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, @@ -342,14 +342,14 @@ 26, 26, 40, 26, 29, 41, 26, 26, 26, 30, 26, 26, 26, 26, 26, 26, 31, 32, 33, 34, 34, 34, 34, 34, 34, 34, 34, 34, 26, 35, - 26, 26, 26, 26, 26, 36, 36, 36, 36, 36, - 36, 36, 36, 36, 36, 36, 37, 36, 36, 36, + 26, 26, 26, 26, 26, 31, 31, 31, 31, 31, + 31, 31, 31, 31, 31, 31, 36, 31, 31, 31, - 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, - 36, 26, 31, 26, 26, 36, 26, 36, 36, 36, - 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, - 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, - 36, 36, 36, 38, 26, 39, 26, 26, 26, 26, + 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, + 31, 26, 37, 26, 26, 31, 26, 31, 31, 31, + 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, + 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, + 31, 31, 31, 38, 26, 39, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, @@ -1257,12 +1257,12 @@ -31, -31, -31, -31, -31, -31, -31, -31, -31, -31, -31, -31, -31, -31, -31, -31, -31, -31, -31, -31, - -31, -31, -31, -31, -31, -31, 83, 83, 83, 83, + -31, -31, -31, -31, -31, -31, 83, 84, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, -31, -31, -31, -31, -31, -31, -31, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, - 83, -31, 83, -31, -31, 83, -31, 83, 83, 83, + 83, -31, 84, -31, -31, 83, -31, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, -31, -31, -31, -31, -31, -31, -31, @@ -1288,16 +1288,16 @@ -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, - -32, -32, 84, -32, -32, -32, 83, 85, 83, 83, - 83, 83, 83, 83, 83, 83, 83, 83, -32, -32, - -32, -32, -32, -32, -32, 83, 83, 83, 83, 83, - 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, + -32, -32, 85, -32, -32, -32, 84, 86, 84, 84, + 84, 84, 84, 84, 84, 84, 84, 84, -32, -32, + -32, -32, -32, -32, -32, 84, 84, 84, 84, 84, + 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, - 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, - 83, -32, 83, -32, -32, 83, -32, 83, 83, 83, - 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, - 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, - 83, 83, 83, -32, -32, -32, -32, -32, -32, -32, + 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, + 84, -32, 84, -32, -32, 84, -32, 84, 84, 84, + 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, + 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, + 84, 84, 84, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, @@ -1320,16 +1320,16 @@ -33, -33, -33, -33, -33, -33, -33, -33, -33, -33, -33, -33, -33, -33, -33, -33, -33, -33, -33, -33, - -33, -33, -33, -33, -33, -33, 83, 83, 86, 86, - 86, 86, 86, 86, 86, 86, 86, 86, -33, -33, - -33, -33, -33, -33, -33, 87, 87, 87, 87, 87, - 87, 87, 87, 87, 87, 87, 88, 87, 87, 89, - 87, 87, 87, 87, 87, 87, 87, 87, 90, 87, - 87, -33, 83, -33, -33, 87, -33, 87, 87, 87, - 87, 87, 87, 87, 87, 87, 87, 87, 88, 87, - 87, 89, 87, 87, 87, 87, 87, 87, 87, 87, + -33, -33, -33, -33, -33, -33, 83, 84, 87, 87, + 87, 87, 87, 87, 87, 87, 87, 87, -33, -33, + -33, -33, -33, -33, -33, 83, 83, 83, 83, 83, + 83, 83, 83, 83, 83, 83, 88, 83, 83, 89, + 83, 83, 83, 83, 83, 83, 83, 83, 90, 83, + 83, -33, 84, -33, -33, 83, -33, 83, 83, 83, + 83, 83, 83, 83, 83, 83, 83, 83, 88, 83, + 83, 89, 83, 83, 83, 83, 83, 83, 83, 83, - 90, 87, 87, -33, -33, -33, -33, -33, -33, -33, + 90, 83, 83, -33, -33, -33, -33, -33, -33, -33, -33, -33, -33, -33, -33, -33, -33, -33, -33, -33, -33, -33, -33, -33, -33, -33, -33, -33, -33, -33, -33, -33, -33, -33, -33, -33, -33, -33, -33, -33, @@ -1351,16 +1351,16 @@ -34, -34, -34, -34, -34, -34, -34, -34, -34, -34, -34, -34, -34, -34, -34, -34, -34, -34, -34, -34, -34, -34, -34, -34, -34, -34, -34, -34, -34, -34, - -34, -34, -34, -34, -34, -34, 83, 83, 86, 86, - 86, 86, 86, 86, 86, 86, 86, 86, -34, -34, + -34, -34, -34, -34, -34, -34, 83, 84, 87, 87, + 87, 87, 87, 87, 87, 87, 87, 87, -34, -34, - -34, -34, -34, -34, -34, 87, 87, 87, 87, 87, - 87, 87, 87, 87, 87, 87, 88, 87, 87, 87, - 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, - 87, -34, 83, -34, -34, 87, -34, 87, 87, 87, - 87, 87, 87, 87, 87, 87, 87, 87, 88, 87, - 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, - 87, 87, 87, -34, -34, -34, -34, -34, -34, -34, + -34, -34, -34, -34, -34, 83, 83, 83, 83, 83, + 83, 83, 83, 83, 83, 83, 88, 83, 83, 83, + 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, + 83, -34, 84, -34, -34, 83, -34, 83, 83, 83, + 83, 83, 83, 83, 83, 83, 83, 83, 88, 83, + 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, + 83, 83, 83, -34, -34, -34, -34, -34, -34, -34, -34, -34, -34, -34, -34, -34, -34, -34, -34, -34, -34, -34, -34, -34, -34, -34, -34, -34, -34, -34, -34, -34, -34, -34, -34, -34, -34, -34, -34, -34, @@ -1413,17 +1413,17 @@ 25, -36, -36, -36, -36, -36, -36, -36, -36, -36, -36, -36, -36, -36, -36, -36, -36, -36, -36, -36, -36, -36, -36, -36, -36, -36, -36, -36, -36, -36, - -36, -36, -36, -36, -36, -36, -36, -36, -36, -36, + -36, -36, -36, -36, 92, -36, -36, -36, -36, -36, - -36, -36, -36, -36, -36, -36, 83, 83, 87, 87, - 87, 87, 87, 87, 87, 87, 87, 87, -36, -36, - -36, -36, -36, -36, -36, 87, 87, 87, 87, 87, - 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, - 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, - 87, -36, 83, -36, -36, 87, -36, 87, 87, 87, - 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, - 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, - 87, 87, 87, -36, -36, -36, -36, -36, -36, -36, + -36, -36, -36, -36, -36, -36, 83, 84, 83, 83, + 83, 83, 83, 83, 83, 83, 83, 83, -36, -36, + -36, -36, -36, -36, -36, 83, 83, 83, 83, 83, + 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, + 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, + 83, -36, 84, -36, -36, 83, -36, 83, 83, 83, + 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, + 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, + 83, 83, 83, -36, -36, -36, -36, -36, -36, -36, -36, -36, -36, -36, -36, -36, -36, -36, -36, -36, -36, -36, -36, -36, -36, -36, -36, -36, -36, -36, @@ -1445,17 +1445,17 @@ 25, -37, -37, -37, -37, -37, -37, -37, -37, -37, -37, -37, -37, -37, -37, -37, -37, -37, -37, -37, -37, -37, -37, -37, -37, -37, -37, -37, -37, -37, - -37, -37, -37, -37, 92, -37, -37, -37, -37, -37, - -37, -37, -37, -37, -37, -37, 83, 83, 87, 87, - 87, 87, 87, 87, 87, 87, 87, 87, -37, -37, - -37, -37, -37, -37, -37, 87, 87, 87, 87, 87, - 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, + -37, -37, -37, -37, -37, -37, -37, -37, -37, -37, + -37, -37, -37, -37, -37, -37, 84, 84, 84, 84, + 84, 84, 84, 84, 84, 84, 84, 84, -37, -37, + -37, -37, -37, -37, -37, 84, 84, 84, 84, 84, + 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, - 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, - 87, -37, 83, -37, -37, 87, -37, 87, 87, 87, - 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, - 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, - 87, 87, 87, -37, -37, -37, -37, -37, -37, -37, + 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, + 84, -37, 84, -37, -37, 84, -37, 84, 84, 84, + 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, + 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, + 84, 84, 84, -37, -37, -37, -37, -37, -37, -37, -37, -37, -37, -37, -37, -37, -37, -37, -37, -37, -37, -37, -37, -37, -37, -37, -37, -37, -37, -37, -37, -37, -37, -37, -37, -37, -37, -37, -37, -37, @@ -2205,7 +2205,7 @@ 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, - 138, 138, 84, 138, 138, 138, 138, 138, 138, 138, + 138, 138, 85, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, @@ -2521,7 +2521,7 @@ 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, - 141, 141, 84, 141, 141, 141, 141, 141, 141, 141, + 141, 141, 85, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, @@ -2900,12 +2900,12 @@ -83, -83, -83, -83, -83, -83, -83, -83, -83, -83, -83, -83, -83, -83, -83, -83, -83, -83, -83, -83, - -83, -83, -83, -83, -83, -83, 83, 83, 83, 83, + -83, -83, -83, -83, -83, -83, 83, 84, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, -83, -83, -83, -83, -83, -83, -83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, - 83, -83, 83, -83, -83, 83, -83, 83, 83, 83, + 83, -83, 84, -83, -83, 83, -83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, @@ -2931,19 +2931,19 @@ -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, - -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, - -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, + -84, -84, -84, -84, -84, -84, 84, 84, 84, 84, + 84, 84, 84, 84, 84, 84, 84, 84, -84, -84, + -84, -84, -84, -84, -84, 84, 84, 84, 84, 84, + 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, + 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, + 84, -84, 84, -84, -84, 84, -84, 84, 84, 84, + 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, + 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, + 84, 84, 84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, - -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, - -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, - -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, - -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, - -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, - -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, - -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, -84, @@ -2959,83 +2959,83 @@ }, { + 25, -85, -85, -85, -85, -85, -85, -85, -85, -85, + -85, -85, -85, -85, -85, -85, -85, -85, -85, -85, + -85, -85, -85, -85, -85, -85, -85, -85, -85, -85, + -85, -85, -85, -85, -85, -85, -85, -85, -85, -85, + -85, -85, -85, -85, -85, -85, -85, -85, -85, -85, + -85, -85, -85, -85, -85, -85, -85, -85, -85, -85, + -85, -85, -85, -85, -85, -85, -85, -85, -85, -85, + -85, -85, -85, -85, -85, -85, -85, -85, -85, -85, + -85, -85, -85, -85, -85, -85, -85, -85, -85, -85, + -85, -85, -85, -85, -85, -85, -85, -85, -85, -85, + + -85, -85, -85, -85, -85, -85, -85, -85, -85, -85, + -85, -85, -85, -85, -85, -85, -85, -85, -85, -85, + -85, -85, -85, -85, -85, -85, -85, -85, -85, -85, + -85, -85, -85, -85, -85, -85, -85, -85, -85, -85, + -85, -85, -85, -85, -85, -85, -85, -85, -85, -85, + -85, -85, -85, -85, -85, -85, -85, -85, -85, -85, + -85, -85, -85, -85, -85, -85, -85, -85, -85, -85, + -85, -85, -85, -85, -85, -85, -85, -85, -85, -85, + -85, -85, -85, -85, -85, -85, -85, -85, -85, -85, + -85, -85, -85, -85, -85, -85, -85, -85, -85, -85, + + -85, -85, -85, -85, -85, -85, -85, -85, -85, -85, + -85, -85, -85, -85, -85, -85, -85, -85, -85, -85, + -85, -85, -85, -85, -85, -85, -85, -85, -85, -85, + -85, -85, -85, -85, -85, -85, -85, -85, -85, -85, + -85, -85, -85, -85, -85, -85, -85, -85, -85, -85, + -85, -85, -85, -85, -85, -85 + }, + + { 25, 151, 151, 151, 151, 151, 151, 151, 151, 151, - -85, 151, 151, 151, 151, 151, 151, 151, 151, 151, + -86, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, + 151, 151, 151, 151, 151, 151, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 151, 151, 151, 151, 151, 151, 151, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 151, 152, 151, 151, 152, 151, 152, 152, 152, - 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, + 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, - 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, + 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151, 151 }, { - 25, -86, -86, -86, -86, -86, -86, -86, -86, -86, - -86, -86, -86, -86, -86, -86, -86, -86, -86, -86, - -86, -86, -86, -86, -86, -86, -86, -86, -86, -86, - -86, -86, -86, -86, -86, -86, -86, -86, -86, -86, - - -86, -86, -86, -86, -86, -86, 83, 83, 86, 86, - 86, 86, 86, 86, 86, 86, 86, 86, -86, -86, - -86, -86, -86, -86, -86, 87, 87, 87, 87, 87, - 87, 87, 87, 87, 87, 87, 88, 87, 87, 87, - 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, - 87, -86, 83, -86, -86, 87, -86, 87, 87, 87, - 87, 87, 87, 87, 87, 87, 87, 87, 88, 87, - 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, - 87, 87, 87, -86, -86, -86, -86, -86, -86, -86, - -86, -86, -86, -86, -86, -86, -86, -86, -86, -86, - - -86, -86, -86, -86, -86, -86, -86, -86, -86, -86, - -86, -86, -86, -86, -86, -86, -86, -86, -86, -86, - -86, -86, -86, -86, -86, -86, -86, -86, -86, -86, - -86, -86, -86, -86, -86, -86, -86, -86, -86, -86, - -86, -86, -86, -86, -86, -86, -86, -86, -86, -86, - -86, -86, -86, -86, -86, -86, -86, -86, -86, -86, - -86, -86, -86, -86, -86, -86, -86, -86, -86, -86, - -86, -86, -86, -86, -86, -86, -86, -86, -86, -86, - -86, -86, -86, -86, -86, -86, -86, -86, -86, -86, - -86, -86, -86, -86, -86, -86, -86, -86, -86, -86, - - -86, -86, -86, -86, -86, -86, -86, -86, -86, -86, - -86, -86, -86, -86, -86, -86 - }, - - { 25, -87, -87, -87, -87, -87, -87, -87, -87, -87, -87, -87, -87, -87, -87, -87, -87, -87, -87, -87, -87, -87, -87, -87, -87, -87, -87, -87, -87, -87, -87, -87, -87, -87, -87, -87, -87, -87, -87, -87, - -87, -87, -87, -87, -87, -87, 83, 83, 87, 87, + -87, -87, -87, -87, -87, -87, 83, 84, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, -87, -87, - -87, -87, -87, -87, -87, 87, 87, 87, 87, 87, - 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, + -87, -87, -87, -87, -87, 83, 83, 83, 83, 83, + 83, 83, 83, 83, 83, 83, 88, 83, 83, 83, - 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, - 87, -87, 83, -87, -87, 87, -87, 87, 87, 87, - 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, - 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, - 87, 87, 87, -87, -87, -87, -87, -87, -87, -87, + 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, + 83, -87, 84, -87, -87, 83, -87, 83, 83, 83, + 83, 83, 83, 83, 83, 83, 83, 83, 88, 83, + 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, + 83, 83, 83, -87, -87, -87, -87, -87, -87, -87, -87, -87, -87, -87, -87, -87, -87, -87, -87, -87, -87, -87, -87, -87, -87, -87, -87, -87, -87, -87, -87, -87, -87, -87, -87, -87, -87, -87, -87, -87, @@ -3058,16 +3058,16 @@ -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, - -88, -88, -88, -88, -88, -88, 83, 83, 87, 87, - 87, 87, 87, 87, 87, 87, 87, 87, -88, -88, - -88, -88, -88, -88, -88, 87, 87, 87, 87, 87, - 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, - 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, - 87, -88, 83, -88, -88, 87, -88, 87, 87, 87, - 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, - 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, + -88, -88, -88, -88, -88, -88, 83, 84, 83, 83, + 83, 83, 83, 83, 83, 83, 83, 83, -88, -88, + -88, -88, -88, -88, -88, 83, 83, 83, 83, 83, + 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, + 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, + 83, -88, 84, -88, -88, 83, -88, 83, 83, 83, + 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, + 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, - 87, 87, 87, -88, -88, -88, -88, -88, -88, -88, + 83, 83, 83, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, -88, @@ -3089,16 +3089,16 @@ -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, - -89, -89, -89, -89, -89, -89, 83, 83, 153, 153, - 153, 153, 153, 153, 153, 153, 87, 87, -89, -89, + -89, -89, -89, -89, -89, -89, 83, 84, 153, 153, + 153, 153, 153, 153, 153, 153, 83, 83, -89, -89, - -89, -89, -89, -89, -89, 87, 87, 87, 87, 87, - 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, - 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, - 87, -89, 83, -89, -89, 87, -89, 87, 87, 87, - 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, - 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, - 87, 87, 87, -89, -89, -89, -89, -89, -89, -89, + -89, -89, -89, -89, -89, 83, 83, 83, 83, 83, + 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, + 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, + 83, -89, 84, -89, -89, 83, -89, 83, 83, 83, + 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, + 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, + 83, 83, 83, -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, @@ -3121,16 +3121,16 @@ -90, -90, -90, -90, -90, -90, -90, -90, -90, -90, -90, -90, -90, -90, -90, -90, -90, -90, -90, -90, -90, -90, -90, -90, -90, -90, -90, -90, -90, -90, - -90, -90, -90, -90, -90, -90, 83, 83, 154, 154, + -90, -90, -90, -90, -90, -90, 83, 84, 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, -90, -90, -90, -90, -90, -90, -90, 154, 154, 154, 154, 154, - 154, 87, 87, 87, 87, 87, 87, 87, 87, 87, - 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, - 87, -90, 83, -90, -90, 87, -90, 154, 154, 154, + 154, 83, 83, 83, 83, 83, 83, 83, 83, 83, + 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, + 83, -90, 84, -90, -90, 83, -90, 154, 154, 154, - 154, 154, 154, 87, 87, 87, 87, 87, 87, 87, - 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, - 87, 87, 87, -90, -90, -90, -90, -90, -90, -90, + 154, 154, 154, 83, 83, 83, 83, 83, 83, 83, + 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, + 83, 83, 83, -90, -90, -90, -90, -90, -90, -90, -90, -90, -90, -90, -90, -90, -90, -90, -90, -90, -90, -90, -90, -90, -90, -90, -90, -90, -90, -90, -90, -90, -90, -90, -90, -90, -90, -90, -90, -90, @@ -5112,16 +5112,16 @@ -153, -153, -153, -153, -153, -153, -153, -153, -153, -153, -153, -153, -153, -153, -153, -153, -153, -153, -153, -153, - -153, -153, -153, -153, -153, -153, 83, 83, 153, 153, - 153, 153, 153, 153, 153, 153, 87, 87, -153, -153, - -153, -153, -153, -153, -153, 87, 87, 87, 87, 87, - 87, 87, 87, 87, 87, 87, 174, 87, 87, 87, - 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, - 87, -153, 83, -153, -153, 87, -153, 87, 87, 87, - 87, 87, 87, 87, 87, 87, 87, 87, 174, 87, - 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, + -153, -153, -153, -153, -153, -153, 83, 84, 153, 153, + 153, 153, 153, 153, 153, 153, 83, 83, -153, -153, + -153, -153, -153, -153, -153, 83, 83, 83, 83, 83, + 83, 83, 83, 83, 83, 83, 174, 83, 83, 83, + 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, + 83, -153, 84, -153, -153, 83, -153, 83, 83, 83, + 83, 83, 83, 83, 83, 83, 83, 83, 174, 83, + 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, - 87, 87, 87, -153, -153, -153, -153, -153, -153, -153, + 83, 83, 83, -153, -153, -153, -153, -153, -153, -153, -153, -153, -153, -153, -153, -153, -153, -153, -153, -153, -153, -153, -153, -153, -153, -153, -153, -153, -153, -153, -153, -153, -153, -153, -153, -153, -153, -153, -153, -153, @@ -5143,16 +5143,16 @@ -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, - -154, -154, -154, -154, -154, -154, 83, 83, 154, 154, + -154, -154, -154, -154, -154, -154, 83, 84, 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, -154, -154, -154, -154, -154, -154, -154, 154, 154, 154, 154, 154, - 154, 87, 87, 87, 87, 87, 175, 87, 87, 87, - 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, - 87, -154, 83, -154, -154, 87, -154, 154, 154, 154, - 154, 154, 154, 87, 87, 87, 87, 87, 175, 87, - 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, - 87, 87, 87, -154, -154, -154, -154, -154, -154, -154, + 154, 83, 83, 83, 83, 83, 175, 83, 83, 83, + 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, + 83, -154, 84, -154, -154, 83, -154, 154, 154, 154, + 154, 154, 154, 83, 83, 83, 83, 83, 175, 83, + 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, + 83, 83, 83, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, @@ -5775,16 +5775,16 @@ -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, - -174, -174, -174, -174, -174, -174, 83, 83, 87, 87, - 87, 87, 87, 87, 87, 87, 87, 87, -174, -174, + -174, -174, -174, -174, -174, -174, 83, 84, 83, 83, + 83, 83, 83, 83, 83, 83, 83, 83, -174, -174, - -174, -174, -174, -174, -174, 87, 87, 87, 87, 87, - 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, - 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, - 87, -174, 83, -174, -174, 87, -174, 87, 87, 87, - 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, - 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, - 87, 87, 87, -174, -174, -174, -174, -174, -174, -174, + -174, -174, -174, -174, -174, 83, 83, 83, 83, 83, + 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, + 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, + 83, -174, 84, -174, -174, 83, -174, 83, 83, 83, + 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, + 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, + 83, 83, 83, -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, @@ -5807,16 +5807,16 @@ -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, - -175, -175, -175, -175, -175, -175, 83, 83, 87, 87, - 87, 87, 87, 87, 87, 87, 87, 87, -175, -175, - -175, -175, -175, -175, -175, 87, 87, 87, 87, 87, - 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, - 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, - 87, -175, 83, -175, -175, 87, -175, 87, 87, 87, + -175, -175, -175, -175, -175, -175, 83, 84, 83, 83, + 83, 83, 83, 83, 83, 83, 83, 83, -175, -175, + -175, -175, -175, -175, -175, 83, 83, 83, 83, 83, + 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, + 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, + 83, -175, 84, -175, -175, 83, -175, 83, 83, 83, - 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, - 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, - 87, 87, 87, -175, -175, -175, -175, -175, -175, -175, + 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, + 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, + 83, 83, 83, -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, @@ -6806,12 +6806,12 @@ 0, 0, 0, 0, 0, 0, 0, 0, 82, 82, 0, 0, 13, 13, 18, 18, 20, 20, 3, 3, 5, 5, 8, 8, 93, 90, 89, 88, 53, 75, - 30, 30, 26, 26, 86, 29, 29, 24, 25, 89, + 29, 30, 26, 26, 86, 29, 30, 24, 25, 89, 2, 70, 74, 55, 91, 51, 52, 33, 91, 80, 78, 79, 76, 80, 82, 84, 83, 91, 13, 14, 91, 11, 9, 10, 13, 2, 18, 19, 15, 16, 91, 18, 23, 20, 22, 21, 3, 5, 5, 8, - 8, 89, 30, 81, 30, 26, 29, 26, 29, 29, + 8, 89, 29, 30, 81, 30, 26, 26, 29, 29, 86, 31, 89, 2, 2, 0, 70, 54, 71, 68, 60, 68, 68, 56, 59, 61, 62, 63, 64, 65, @@ -6841,7 +6841,7 @@ 0, 0, 0, 0, 133, 0, 134, 0, 137, 0, 138, 0, 0, 0, 137, 0, 140, 0, 0, 0, 141, 140, 0, 0, 0, 0, 144, 145, 145, 147, - 147, 0, 0, 0, 151, 0, 0, 0, 0, 0, + 147, 0, 0, 0, 0, 151, 0, 0, 0, 0, 91, 0, 0, 0, 0, 0, 97, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -6863,16 +6863,16 @@ static yyconst short int yy_rule_linenum[92] = { 0, - 325, 326, 327, 347, 348, 350, 351, 362, 369, 370, - 371, 372, 373, 374, 376, 377, 385, 386, 387, 389, - 390, 391, 392, 394, 395, 397, 398, 399, 408, 427, - 432, 438, 439, 444, 451, 456, 458, 459, 460, 461, - 462, 463, 464, 465, 466, 467, 468, 469, 470, 471, - 472, 477, 482, 483, 484, 489, 496, 501, 503, 504, - 505, 506, 507, 508, 509, 510, 511, 512, 513, 514, - 519, 520, 521, 522, 527, 528, 536, 541, 542, 543, - 549, 555, 556, 557, 558, 560, 561, 563, 573, 575, - 584 + 326, 327, 328, 348, 349, 351, 352, 363, 370, 371, + 372, 373, 374, 375, 377, 378, 386, 387, 388, 390, + 391, 392, 393, 395, 396, 398, 399, 400, 409, 428, + 433, 439, 440, 445, 452, 457, 459, 460, 461, 462, + 463, 464, 465, 466, 467, 468, 469, 470, 471, 472, + 473, 478, 483, 484, 485, 490, 497, 502, 504, 505, + 506, 507, 508, 509, 510, 511, 512, 513, 514, 515, + 520, 521, 522, 523, 528, 529, 537, 542, 543, 544, + 550, 556, 557, 558, 559, 561, 562, 564, 574, 576, + 585 } ; @@ -7097,6 +7097,7 @@ { "GRAYED", tGRAYED, 0, 0, 0}, { "GROUPBOX", tGROUPBOX, 0, 0, 0}, { "HELP", tHELP, 0, 0, 0}, + { "HTML", tHTML, 0, 0, 0}, { "ICON", tICON, 0, 0, 0}, { "IMPURE", tIMPURE, 0, 0, 0}, { "INACTIVE", tINACTIVE, 0, 0, 0}, @@ -7194,7 +7195,7 @@ * The flexer starts here ************************************************************************ ** */ -#line 7198 "lex.yy.c" +#line 7199 "lex.yy.c" /* Macros after this point can all be overridden by user definitions in * section 1. @@ -7348,7 +7349,7 @@ register char *yy_cp = NULL, *yy_bp = NULL; register int yy_act; -#line 306 "./parser.l" +#line 307 "./parser.l" /* * Catch the GCC-style line statements here and parse them. @@ -7368,7 +7369,7 @@ * because we only want to know the linenumber and * filename. */ -#line 7372 "lex.yy.c" +#line 7373 "lex.yy.c" if ( yy_init ) { @@ -7457,28 +7458,25 @@ case 1: YY_RULE_SETUP -#line 325 "./parser.l" +#line 326 "./parser.l" yy_push_state(pp_pragma); YY_BREAK case 2: YY_RULE_SETUP -#line 326 "./parser.l" +#line 327 "./parser.l" yy_push_state(pp_line); YY_BREAK case 3: YY_RULE_SETUP -#line 327 "./parser.l" +#line 328 "./parser.l" { int lineno; char *cptr; char *fname; yy_pop_state(); lineno = (int)strtol(yytext, &cptr, 10); -#if 0 - /* ignore malformed line numbers by gcc: # 0 "<built-in>" */ if(!lineno) yyerror("Malformed '#...' line-directive; invalid linenumber"); -#endif fname = strchr(cptr, '"'); if(!fname) yyerror("Malformed '#...' line-directive; missing filename"); @@ -7493,22 +7491,22 @@ YY_BREAK case 4: YY_RULE_SETUP -#line 347 "./parser.l" +#line 348 "./parser.l" yyless(9); yy_pop_state(); yy_push_state(pp_code_page); YY_BREAK case 5: YY_RULE_SETUP -#line 348 "./parser.l" +#line 349 "./parser.l" yy_pop_state(); if (pedantic) yywarning("Unrecognized #pragma directive '%s'",yytext); YY_BREAK case 6: YY_RULE_SETUP -#line 350 "./parser.l" +#line 351 "./parser.l" current_codepage = -1; yy_pop_state(); YY_BREAK case 7: YY_RULE_SETUP -#line 351 "./parser.l" +#line 352 "./parser.l" { char *p = yytext; yy_pop_state(); @@ -7523,7 +7521,7 @@ YY_BREAK case 8: YY_RULE_SETUP -#line 362 "./parser.l" +#line 363 "./parser.l" yy_pop_state(); yyerror("Malformed #pragma code_page directive"); YY_BREAK /* @@ -7533,42 +7531,42 @@ */ case 9: YY_RULE_SETUP -#line 369 "./parser.l" +#line 370 "./parser.l" stripslevel++; YY_BREAK case 10: YY_RULE_SETUP -#line 370 "./parser.l" +#line 371 "./parser.l" stripslevel--; YY_BREAK case 11: YY_RULE_SETUP -#line 371 "./parser.l" +#line 372 "./parser.l" if(!stripslevel) yy_pop_state(); YY_BREAK case 12: YY_RULE_SETUP -#line 372 "./parser.l" +#line 373 "./parser.l" ; /* To catch comments */ YY_BREAK case 13: YY_RULE_SETUP -#line 373 "./parser.l" +#line 374 "./parser.l" ; /* Ignore rest */ YY_BREAK case 14: YY_RULE_SETUP -#line 374 "./parser.l" +#line 375 "./parser.l" line_number++; char_number = 1; YY_BREAK case 15: YY_RULE_SETUP -#line 376 "./parser.l" +#line 377 "./parser.l" stripplevel++; YY_BREAK case 16: YY_RULE_SETUP -#line 377 "./parser.l" +#line 378 "./parser.l" { stripplevel--; if(!stripplevel) @@ -7580,62 +7578,62 @@ YY_BREAK case 17: YY_RULE_SETUP -#line 385 "./parser.l" +#line 386 "./parser.l" ; /* To catch comments */ YY_BREAK case 18: YY_RULE_SETUP -#line 386 "./parser.l" +#line 387 "./parser.l" ; /* Ignore rest */ YY_BREAK case 19: YY_RULE_SETUP -#line 387 "./parser.l" +#line 388 "./parser.l" line_number++; char_number = 1; YY_BREAK case 20: YY_RULE_SETUP -#line 389 "./parser.l" +#line 390 "./parser.l" ; /* Ignore */ YY_BREAK case 21: YY_RULE_SETUP -#line 390 "./parser.l" +#line 391 "./parser.l" yy_pop_state(); /* Kill the semicolon */ YY_BREAK case 22: YY_RULE_SETUP -#line 391 "./parser.l" +#line 392 "./parser.l" line_number++; char_number = 1; yy_pop_state(); YY_BREAK case 23: YY_RULE_SETUP -#line 392 "./parser.l" +#line 393 "./parser.l" yyless(0); yy_pop_state(); YY_BREAK case 24: YY_RULE_SETUP -#line 394 "./parser.l" +#line 395 "./parser.l" return tBEGIN; YY_BREAK case 25: YY_RULE_SETUP -#line 395 "./parser.l" +#line 396 "./parser.l" return tEND; YY_BREAK case 26: YY_RULE_SETUP -#line 397 "./parser.l" +#line 398 "./parser.l" { yylval.num = strtoul(yytext, 0, 10); return toupper(yytext[yyleng-1]) == 'L' ? tLNUMBER : tNUMBER; } YY_BREAK case 27: YY_RULE_SETUP -#line 398 "./parser.l" +#line 399 "./parser.l" { yylval.num = strtoul(yytext, 0, 16); return toupper(yytext[yyleng-1]) == 'L' ? tLNUMBER : tNUMBER; } YY_BREAK case 28: YY_RULE_SETUP -#line 399 "./parser.l" +#line 400 "./parser.l" { yylval.num = strtoul(yytext+2, 0, 8); return toupper(yytext[yyleng-1]) == 'L' ? tLNUMBER : tNUMBER; } YY_BREAK /* @@ -7647,7 +7645,7 @@ */ case 29: YY_RULE_SETUP -#line 408 "./parser.l" +#line 409 "./parser.l" { struct keyword *tok = iskeyword(yytext); @@ -7670,7 +7668,7 @@ YY_BREAK case 30: YY_RULE_SETUP -#line 427 "./parser.l" +#line 428 "./parser.l" yylval.str = make_string(yytext); return tFILENAME; YY_BREAK /* @@ -7678,7 +7676,7 @@ */ case 31: YY_RULE_SETUP -#line 432 "./parser.l" +#line 433 "./parser.l" { yy_push_state(yylstr); wbufidx = 0; @@ -7687,10 +7685,10 @@ } YY_BREAK case 32: -#line 439 "./parser.l" +#line 440 "./parser.l" case 33: YY_RULE_SETUP -#line 439 "./parser.l" +#line 440 "./parser.l" { yy_pop_state(); yylval.str = get_buffered_wstring(); @@ -7699,7 +7697,7 @@ YY_BREAK case 34: YY_RULE_SETUP -#line 444 "./parser.l" +#line 445 "./parser.l" { /* octal escape sequence */ unsigned int result; result = strtoul(yytext+1, 0, 8); @@ -7710,7 +7708,7 @@ YY_BREAK case 35: YY_RULE_SETUP -#line 451 "./parser.l" [truncated at 1000 lines; 4887 more skipped]

1 0

[ea] 17285: Cleanup.
by ea＠svn.reactos.com 11 Aug '05

11 Aug '05

Cleanup. Modified: trunk/vms/lib/vmsdll/vmsdll.xml _____ Modified: trunk/vms/lib/vmsdll/vmsdll.xml --- trunk/vms/lib/vmsdll/vmsdll.xml 2005-08-11 11:52:40 UTC (rev 17284) +++ trunk/vms/lib/vmsdll/vmsdll.xml 2005-08-11 12:23:51 UTC (rev 17285) @@ -1,14 +1,7 @@ -<module name="vmsdll" type="nativedll" installbase="system32" installname="vmsdll.dll"> +<module name="vmsdll" type="nativedll"> <bootstrap base="reactos/system32" /> <importlibrary definition="vmsdll.def" /> <include base="vmsdll">../include</include> - <define name="_DISABLE_TIDENTS" /> - <define name="__USE_W32API" /> - <define name="_WIN32_WINNT">0x0502</define> - <define name="_NTOSKRNL_" /> - <library>rtl</library> - <library>intrlck</library> - <library>string</library> <linkerflag>-lgcc</linkerflag> <file>dllmain.c</file> <directory name="lib">

1 0

[ea] 17284: VMS: use csrsrv!CsrAddStaticServerThread to hook the listening port.
by ea＠svn.reactos.com 11 Aug '05

11 Aug '05

VMS: use csrsrv!CsrAddStaticServerThread to hook the listening port. Modified: trunk/vms/server/server.c _____ Modified: trunk/vms/server/server.c --- trunk/vms/server/server.c 2005-08-11 11:49:36 UTC (rev 17283) +++ trunk/vms/server/server.c 2005-08-11 11:52:40 UTC (rev 17284) @@ -32,9 +32,9 @@ /********************************************************************** * NAME PRIVATE - * VmspCreatePort/1 + * VmsStaticServerThread/1 */ -NTSTATUS VmsStaticServerThread (PVOID x) +VOID STDCALL VmsStaticServerThread (PVOID x) { NTSTATUS Status = STATUS_SUCCESS; LPC_MAX_MESSAGE Request; @@ -62,7 +62,6 @@ __FUNCTION__, Status); } } - return Status; } /*===================================================================== @@ -72,7 +71,7 @@ NTSTATUS STDCALL ServerDllInitialization (ULONG ArgumentCount, LPWSTR *Argument) { - return CsrAddStaticServerThread (); + return CsrAddStaticServerThread (VmsStaticServerThread); } /* EOF */

1 0

[ea] 17283: Modify CsrAddStaticServerThread signature.
by ea＠svn.reactos.com 11 Aug '05

11 Aug '05

Modify CsrAddStaticServerThread signature. Modified: trunk/reactos/include/subsys/csr/server.h _____ Modified: trunk/reactos/include/subsys/csr/server.h --- trunk/reactos/include/subsys/csr/server.h 2005-08-11 09:19:10 UTC (rev 17282) +++ trunk/reactos/include/subsys/csr/server.h 2005-08-11 11:49:36 UTC (rev 17283) @@ -37,9 +37,11 @@ } CSR_WAIT, * PCSR_WAIT; +typedef VOID (STDCALL * CSR_SERVER_THREAD)(PVOID); + /* symbols exported by native DLL csrsrv.dll */ -NTSTATUS STDCALL CsrAddStaticServerThread(); +NTSTATUS STDCALL CsrAddStaticServerThread(CSR_SERVER_THREAD); NTSTATUS STDCALL CsrCallServerFromServer(); NTSTATUS STDCALL CsrCreateProcess(PCSR_SESSION,PCSR_PROCESS*); NTSTATUS STDCALL CsrCreateRemoteThread(); @@ -55,7 +57,6 @@ NTSTATUS STDCALL CsrDestroySession (PCSR_SESSION); NTSTATUS STDCALL CsrDestroyThread(PCSR_THREAD); NTSTATUS STDCALL CsrExecServerThread(); -NTSTATUS STDCALL CsrGetApiPorts(PHANDLE,PHANDLE); NTSTATUS STDCALL CsrGetProcessLuid(PCSR_PROCESS,PLUID); NTSTATUS STDCALL CsrImpersonateClient(); NTSTATUS STDCALL CsrLockProcessByClientId();

1 0

[ea] 17282: Fix HEAD compilation.
by ea＠svn.reactos.com 11 Aug '05

11 Aug '05

Fix HEAD compilation. LPC_MESSAGE.DataSize ==> PORT_MESSAGE.u1.s1.DataLength LPC_MESSAGE.MessageSize ==> PORT.u1.s1.TotalLength Modified: trunk/reactos/subsys/win32k/ntuser/csr.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/csr.c --- trunk/reactos/subsys/win32k/ntuser/csr.c 2005-08-11 09:07:48 UTC (rev 17281) +++ trunk/reactos/subsys/win32k/ntuser/csr.c 2005-08-11 09:19:10 UTC (rev 17282) @@ -54,8 +54,8 @@ return STATUS_INVALID_PORT_HANDLE; } - Request->Header.DataSize = sizeof(CSR_API_MESSAGE) - LPC_MESSAGE_BASE_SIZE; - Request->Header.MessageSize = sizeof(CSR_API_MESSAGE); + Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - LPC_MESSAGE_BASE_SIZE; + Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); /* Switch to the process in which the WindowsApiPort handle is valid */ OldProcess = PsGetCurrentProcess();

1 0

[ea] 17281: Emit Win32 error messages on failure.
by ea＠svn.reactos.com 11 Aug '05

11 Aug '05

Emit Win32 error messages on failure. Modified: trunk/reactos/subsys/system/sm/En.rc Modified: trunk/reactos/subsys/system/sm/resource.h Modified: trunk/reactos/subsys/system/sm/sm.c Modified: trunk/reactos/subsys/system/sm/sm.xml Added: trunk/reactos/subsys/system/sm/win32err.c _____ Modified: trunk/reactos/subsys/system/sm/En.rc --- trunk/reactos/subsys/system/sm/En.rc 2005-08-11 09:01:30 UTC (rev 17280) +++ trunk/reactos/subsys/system/sm/En.rc 2005-08-11 09:07:48 UTC (rev 17281) @@ -32,8 +32,6 @@ IDS_Unknown, "Unknown command '%s'.\n" -IDS_Status, "Status 0x%08lx\n" - IDS_SM1, "SM SubSystem Directory\n\n\ SSID PID Flags\n\ ---- -------- ------------\n" _____ Modified: trunk/reactos/subsys/system/sm/resource.h --- trunk/reactos/subsys/system/sm/resource.h 2005-08-11 09:01:30 UTC (rev 17280) +++ trunk/reactos/subsys/system/sm/resource.h 2005-08-11 09:07:48 UTC (rev 17281) @@ -14,14 +14,13 @@ #define IDS_shutdown_msg 209 #define IDS_Unknown 300 -#define IDS_Not_Imp 301 +#define IDS_Not_Imp 301 #define IDS_ID 302 #define IDS_SM2 303 #define IDS_SM1 304 -#define IDS_Status 305 -#define IDS_Mangers 306 -#define IDS_USING 307 -#define IDS_FAILS_MNG 308 +#define IDS_Mangers 305 +#define IDS_USING 306 +#define IDS_FAILS_MNG 307 /* EOF */ _____ Modified: trunk/reactos/subsys/system/sm/sm.c --- trunk/reactos/subsys/system/sm/sm.c 2005-08-11 09:01:30 UTC (rev 17280) +++ trunk/reactos/subsys/system/sm/sm.c 2005-08-11 09:07:48 UTC (rev 17281) @@ -35,12 +35,21 @@ #include <sm/helper.h> +VOID PrintWin32Error(PWCHAR,DWORD); /* win32err.c */ + #define SM_CMD(n) cmd_##n #define SM_CMD_DECL(n) int SM_CMD(n)(int argc, char * argv[]) #define SM_CMD_CALL(n,c,v) SM_CMD(n)((c),(v)) HANDLE hSmApiPort = (HANDLE) 0; +VOID STDCALL PrintStatusError (NTSTATUS Status) +{ + DWORD Win32Error = RtlNtStatusToDosError (Status); + + PrintWin32Error (L"sm", Win32Error); +} + typedef struct _SM_CMD_DESCRIPTOR { TCHAR Name[RC_STRING_MAX_SIZE]; @@ -117,9 +126,7 @@ #endif if (STATUS_SUCCESS != Status) { - LoadString( GetModuleHandle(NULL), IDS_Status, (LPTSTR) UsageMessage,RC_STRING_MAX_SIZE); - - _tprintf(UsageMessage, Status); + PrintStatusError (Status); } } @@ -197,8 +204,7 @@ & ReturnDataLength); if (STATUS_SUCCESS != Status) { - LoadString( GetModuleHandle(NULL), IDS_Status, (LPTSTR) UsageMessage,RC_STRING_MAX_SIZE); - _tprintf(UsageMessage, Status); + PrintStatusError (Status); return EXIT_FAILURE; } switch (argc) _____ Modified: trunk/reactos/subsys/system/sm/sm.xml --- trunk/reactos/subsys/system/sm/sm.xml 2005-08-11 09:01:30 UTC (rev 17280) +++ trunk/reactos/subsys/system/sm/sm.xml 2005-08-11 09:07:48 UTC (rev 17281) @@ -6,5 +6,6 @@ <library>ntdll</library> <library>kernel32</library> <file>sm.c</file> + <file>win32err.c</file> <file>sm.rc</file> </module> _____ Added: trunk/reactos/subsys/system/sm/win32err.c --- trunk/reactos/subsys/system/sm/win32err.c 2005-08-11 09:01:30 UTC (rev 17280) +++ trunk/reactos/subsys/system/sm/win32err.c 2005-08-11 09:07:48 UTC (rev 17281) @@ -0,0 +1,70 @@ +/* $Id: win32err.c 16861 2005-07-29 13:46:03Z ea $ + * + * win32err.c + * + * Copyright (c) 1998 Mark Russinovich + * Systems Internals + * http://www.sysinternals.com/ + * + * -------------------------------------------------------------------- + * + * This software is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This software 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this software; see the file COPYING.LIB. If + * not, write to the Free Software Foundation, Inc., 675 Mass Ave, + * Cambridge, MA 02139, USA. + * + * -------------------------------------------------------------------- + * + * Print a Win32 error. + * + * 1999 February (Emanuele Aliberti) + * Taken from chkdskx.c and formatx.c by Mark Russinovich + * to be used in all sysutils. + */ +#include <windows.h> +#include <stdio.h> + +//--------------------------------------------------------------------- - +// +// PrintWin32Error +// +// Takes the win32 error code and prints the text version. +// +//--------------------------------------------------------------------- - +void +PrintWin32Error( + PWCHAR Message, + DWORD ErrorCode + ) +{ + PVOID lpMsgBuf; + + FormatMessageW( + (FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM), + NULL, + ErrorCode, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + (LPWSTR)& lpMsgBuf, + 0, + NULL + ); + wprintf( + L"%s: %s\n", + Message, + lpMsgBuf + ); + LocalFree( lpMsgBuf ); +} + + +/* EOF */

1 0

[ea] 17280: LPC_MESSAGE.MessageType ==> PORT_MESSAGE.u2.s2.Type
by ea＠svn.reactos.com 11 Aug '05

11 Aug '05

LPC_MESSAGE.MessageType ==> PORT_MESSAGE.u2.s2.Type Make head copmpile. Modified: trunk/reactos/services/eventlog/logport.c _____ Modified: trunk/reactos/services/eventlog/logport.c --- trunk/reactos/services/eventlog/logport.c 2005-08-11 08:46:57 UTC (rev 17279) +++ trunk/reactos/services/eventlog/logport.c 2005-08-11 09:01:30 UTC (rev 17280) @@ -146,18 +146,18 @@ DPRINT("Received message\n"); - if (Request.Header.MessageType == LPC_PORT_CLOSED) + if (Request.Header.u2.s2.Type == LPC_PORT_CLOSED) { DPRINT("Port closed\n"); return STATUS_SUCCESS; } - if (Request.Header.MessageType == LPC_REQUEST) + if (Request.Header.u2.s2.Type == LPC_REQUEST) { DPRINT("Received request\n"); } - else if (Request.Header.MessageType == LPC_DATAGRAM) + else if (Request.Header.u2.s2.Type == LPC_DATAGRAM) { DPRINT("Received datagram\n");

1 0

[ea] 17279: First attempt to convert the VMS demo server.
by ea＠svn.reactos.com 11 Aug '05

11 Aug '05

First attempt to convert the VMS demo server. Note: it does NOT work. Added: trunk/vms/copying Added: trunk/vms/directory.xml Modified: trunk/vms/include/vms/lpcproto.h Added: trunk/vms/lib/directory.xml Modified: trunk/vms/lib/vmsdll/dllmain.c Modified: trunk/vms/lib/vmsdll/lib/stubs.c Modified: trunk/vms/lib/vmsdll/makefile Modified: trunk/vms/lib/vmsdll/readme.txt Modified: trunk/vms/lib/vmsdll/sys/stubs.c Modified: trunk/vms/lib/vmsdll/vmsdll.def Modified: trunk/vms/lib/vmsdll/vmsdll.rc Added: trunk/vms/lib/vmsdll/vmsdll.xml Modified: trunk/vms/makefile Added: trunk/vms/readme.txt Added: trunk/vms/server/dllmain.c Deleted: trunk/vms/server/init.c Modified: trunk/vms/server/makefile Modified: trunk/vms/server/server.c Added: trunk/vms/server/vmssrv.def Added: trunk/vms/server/vmssrv.h Added: trunk/vms/server/vmssrv.rc Added: trunk/vms/server/vmssrv.xml Deleted: trunk/vms/server/vmsss.c Deleted: trunk/vms/server/vmsss.h Deleted: trunk/vms/server/vmsss.rc Added: trunk/vms/tools/directory.xml Deleted: trunk/vms/tools/mksystab/makefile Added: trunk/vms/tools/mksystab/mksystab.xml _____ Added: trunk/vms/copying --- trunk/vms/copying 2005-08-11 07:13:03 UTC (rev 17278) +++ trunk/vms/copying 2005-08-11 08:46:57 UTC (rev 17279) @@ -0,0 +1,340 @@ + + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 675 Mass Ave, Cambridge, MA 02139, USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + Appendix: How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) 19yy <name of author> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. Property changes on: trunk/vms/copying ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/vms/directory.xml --- trunk/vms/directory.xml 2005-08-11 07:13:03 UTC (rev 17278) +++ trunk/vms/directory.xml 2005-08-11 08:46:57 UTC (rev 17279) @@ -0,0 +1,12 @@ +<directory name="lib"> + <xi:include href="lib/directory.xml" /> +</directory> + +<directory name="server"> + <xi:include href="server/vmssrv.xml" /> +</directory> + +<directory name="tools"> + <xi:include href="tools/directory.xml" /> +</directory> + Property changes on: trunk/vms/directory.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/vms/include/vms/lpcproto.h --- trunk/vms/include/vms/lpcproto.h 2005-08-11 07:13:03 UTC (rev 17278) +++ trunk/vms/include/vms/lpcproto.h 2005-08-11 08:46:57 UTC (rev 17279) @@ -1,10 +1,12 @@ -#ifndef __VMS_SYS_LPCPROTO_H -#define __VMS_SYS_LPCPROTO_H - -#define VMS_LPCPROTO_VERSION 1 - -#define VMS_OBNS_ROOT L"\\VMS" -#define VMS_API_PORT_NAME L"\\VMS\\ApiPort" -#define VMS_SBAPI_PORT_NAME L"\\VMS\\SbApiPort" - -#endif +#ifndef __VMS_SYS_LPCPROTO_H +#define __VMS_SYS_LPCPROTO_H + +#define VMS_LPCPROTO_VERSION 1 + +#define CSR_VMS_SRV 1 + +#define VMS_OBNS_ROOT L"\\VMS" +#define VMS_API_PORT_NAME L"\\VMS\\ApiPort" +#define VMS_SBAPI_PORT_NAME L"\\VMS\\SbApiPort" + +#endif Property changes on: trunk/vms/include/vms/lpcproto.h ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/vms/lib/directory.xml --- trunk/vms/lib/directory.xml 2005-08-11 07:13:03 UTC (rev 17278) +++ trunk/vms/lib/directory.xml 2005-08-11 08:46:57 UTC (rev 17279) @@ -0,0 +1,3 @@ +<directory name="vmsdll"> + <xi:include href="vmsdll/vmsdll.xml" /> +</directory> Property changes on: trunk/vms/lib/directory.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/vms/lib/vmsdll/dllmain.c --- trunk/vms/lib/vmsdll/dllmain.c 2005-08-11 07:13:03 UTC (rev 17278) +++ trunk/vms/lib/vmsdll/dllmain.c 2005-08-11 08:46:57 UTC (rev 17279) @@ -1,39 +1,39 @@ -/* $Id: dllmain.c,v 1.5 2002/11/24 18:42:15 robd Exp $ - * - * dllmain.c - * - * A stub DllMain function which will be called by DLLs which do not - * have a user supplied DllMain. - * - * Contributors: - * Created by Colin Peters <colin(a)bird.fu.is.saga-u.ac.jp> - * - * THIS SOFTWARE IS NOT COPYRIGHTED - * - * This source code is offered for use in the public domain. You may - * use, modify or distribute it freely. - * - * This code is distributed in the hope that it will be useful but - * WITHOUT ANY WARRANTY. ALL WARRENTIES, EXPRESS OR IMPLIED ARE HEREBY - * DISCLAMED. This includes but is not limited to warrenties of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - * $Revision: 1.5 $ - * $Author: robd $ - * $Date: 2002/11/24 18:42:15 $ - * - */ - -#include <windows.h> - - -/* LIBRARY ENTRY POINT ********************************************************/ - -BOOL -WINAPI -DllMain(HANDLE hDll, DWORD dwReason, LPVOID lpReserved) -{ - return TRUE; -} - -/* EOF */ +/* $Id$ + * + * dllmain.c + * + * A stub DllMain function which will be called by DLLs which do not + * have a user supplied DllMain. + * + * Contributors: + * Created by Colin Peters <colin(a)bird.fu.is.saga-u.ac.jp> + * + * THIS SOFTWARE IS NOT COPYRIGHTED + * + * This source code is offered for use in the public domain. You may + * use, modify or distribute it freely. + * + * This code is distributed in the hope that it will be useful but + * WITHOUT ANY WARRANTY. ALL WARRENTIES, EXPRESS OR IMPLIED ARE HEREBY + * DISCLAMED. This includes but is not limited to warrenties of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * $Revision: 1.5 $ + * $Author$ + * $Date$ + * + */ + +#include <windows.h> + + +/* LIBRARY ENTRY POINT ********************************************************/ + +BOOL +WINAPI +DllMain(HANDLE hDll, DWORD dwReason, LPVOID lpReserved) +{ + return TRUE; +} + +/* EOF */ Property changes on: trunk/vms/lib/vmsdll/dllmain.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Modified: trunk/vms/lib/vmsdll/lib/stubs.c --- trunk/vms/lib/vmsdll/lib/stubs.c 2005-08-11 07:13:03 UTC (rev 17278) +++ trunk/vms/lib/vmsdll/lib/stubs.c 2005-08-11 08:46:57 UTC (rev 17279) @@ -1 +1 @@ -void lib$find_file () { } +void lib$find_file () { } Property changes on: trunk/vms/lib/vmsdll/lib/stubs.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Modified: trunk/vms/lib/vmsdll/makefile --- trunk/vms/lib/vmsdll/makefile 2005-08-11 07:13:03 UTC (rev 17278) +++ trunk/vms/lib/vmsdll/makefile 2005-08-11 08:46:57 UTC (rev 17279) @@ -1,44 +1,44 @@ -# $Id$ -# -PATH_TO_TOP = ../../../reactos - -TARGET_TYPE = dynlink - -TARGET_NAME = vmsdll - -TARGET_CFLAGS = -Wall -Werror -fno-builtin \ - -D__USE_W32API \ - -D_WIN32_IE=0x0500 \ - -D_WIN32_WINNT=0x501 \ - -DWINVER=0x600 \ - -TARGET_LFLAGS = -nostartfiles -nostdlib - -TARGET_SDKLIBS = ntdll.a - -LIB_OBJECTS = \ - lib\stubs.o - -RMS_OBJECTS = \ - rms\stubs.o - -MISC_OBJECTS = \ - dllmain.o - -SYS_OBJECTS = \ - sys\stubs.o - -TARGET_OBJECTS = \ - $(LIB_OBJECTS) \ - $(RMS_OBJECTS) \ - $(SYS_OBJECTS) \ - $(MISC_OBJECTS) - -DEP_OBJECTS = $(TARGET_OBJECTS) - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -include $(TOOLS_PATH)/depend.mk - +# $Id$ +# +PATH_TO_TOP = ../../../reactos + +TARGET_TYPE = dynlink + +TARGET_NAME = vmsdll + +TARGET_CFLAGS = -Wall -Werror -fno-builtin \ + -D__USE_W32API \ + -D_WIN32_IE=0x0500 \ + -D_WIN32_WINNT=0x501 \ + -DWINVER=0x600 \ + +TARGET_LFLAGS = -nostartfiles -nostdlib + +TARGET_SDKLIBS = ntdll.a + +LIB_OBJECTS = \ + lib\stubs.o + +RMS_OBJECTS = \ + rms\stubs.o + +MISC_OBJECTS = \ + dllmain.o + +SYS_OBJECTS = \ + sys\stubs.o + +TARGET_OBJECTS = \ + $(LIB_OBJECTS) \ + $(RMS_OBJECTS) \ + $(SYS_OBJECTS) \ + $(MISC_OBJECTS) + +DEP_OBJECTS = $(TARGET_OBJECTS) + +include $(PATH_TO_TOP)/rules.mak + +include $(TOOLS_PATH)/helper.mk + +include $(TOOLS_PATH)/depend.mk + Property changes on: trunk/vms/lib/vmsdll/makefile ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Modified: trunk/vms/lib/vmsdll/readme.txt --- trunk/vms/lib/vmsdll/readme.txt 2005-08-11 07:13:03 UTC (rev 17278) +++ trunk/vms/lib/vmsdll/readme.txt 2005-08-11 08:46:57 UTC (rev 17279) @@ -1,7 +1,7 @@ -VMSDLL - ReactOS VMS+ Environment Subsystem - -lib = Library APIs - -rms = Record Management Services APIs - -sys = System APIs \ No newline at end of file +VMSDLL - ReactOS VMS+ Environment Subsystem Client Library + +lib = Library APIs + +rms = Record Management Services APIs + +sys = System APIs Property changes on: trunk/vms/lib/vmsdll/readme.txt ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native Property changes on: trunk/vms/lib/vmsdll/rms/stubs.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Modified: trunk/vms/lib/vmsdll/sys/stubs.c --- trunk/vms/lib/vmsdll/sys/stubs.c 2005-08-11 07:13:03 UTC (rev 17278) +++ trunk/vms/lib/vmsdll/sys/stubs.c 2005-08-11 08:46:57 UTC (rev 17279) @@ -1,30 +1,30 @@ -/* $Id$ */ -void sys$ascefc (void) {} -void sys$asctim (void) {} -void sys$assign (void) {} -void sys$bintim (void) {} -void sys$clref (void) {} -void sys$crelnm (void) {} -void sys$crelnt (void) {} -void sys$dclast (void) {} -void sys$enq (void) {} -void sys$forcex (void) {} -void sys$gettim (void) {} -void sys$hiber (void) {} -void sys$numtim (void) {} -void sys$qio (void) {} -void sys$qiow (void) {} -void sys$readef (void) {} -void sys$schdwk (void) {} -void sys$setef (void) {} -void sys$setast (void) {} -void sys$setime (void) {} -void sys$setimr (void) {} -void sys$setpri (void) {} -void sys$setprn (void) {} -void sys$synch (void) {} -void sys$trnlnm (void) {} -void sys$waitfr (void) {} -void sys$wake (void) {} - -/* EOF */ +/* $Id$ */ +void sys$ascefc (void) {} +void sys$asctim (void) {} +void sys$assign (void) {} +void sys$bintim (void) {} +void sys$clref (void) {} +void sys$crelnm (void) {} +void sys$crelnt (void) {} +void sys$dclast (void) {} +void sys$enq (void) {} +void sys$forcex (void) {} +void sys$gettim (void) {} +void sys$hiber (void) {} +void sys$numtim (void) {} +void sys$qio (void) {} +void sys$qiow (void) {} +void sys$readef (void) {} +void sys$schdwk (void) {} +void sys$setef (void) {} +void sys$setast (void) {} +void sys$setime (void) {} +void sys$setimr (void) {} +void sys$setpri (void) {} +void sys$setprn (void) {} +void sys$synch (void) {} +void sys$trnlnm (void) {} +void sys$waitfr (void) {} +void sys$wake (void) {} + +/* EOF */ Property changes on: trunk/vms/lib/vmsdll/sys/stubs.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Modified: trunk/vms/lib/vmsdll/vmsdll.def --- trunk/vms/lib/vmsdll/vmsdll.def 2005-08-11 07:13:03 UTC (rev 17278) +++ trunk/vms/lib/vmsdll/vmsdll.def 2005-08-11 08:46:57 UTC (rev 17279) @@ -1,32 +1,32 @@ -LIBRARY vmsdll.dll -EXPORTS -; LIB -lib$find_file -; SYS -sys$ascefc -sys$asctim -sys$assign -sys$bintim -sys$clref -sys$crelnm -sys$crelnt -sys$dclast -sys$enq -sys$forcex -sys$gettim -sys$hiber -sys$numtim -sys$qio -sys$qiow -sys$readef -sys$schdwk -sys$setef -sys$setast -sys$setime -sys$setimr -sys$setpri -sys$setprn -sys$synch -sys$trnlnm -sys$waitfr -sys$wake +LIBRARY vmsdll.dll +EXPORTS +; LIB +lib$find_file +; SYS +sys$ascefc +sys$asctim +sys$assign +sys$bintim +sys$clref +sys$crelnm +sys$crelnt +sys$dclast +sys$enq +sys$forcex +sys$gettim +sys$hiber +sys$numtim +sys$qio +sys$qiow +sys$readef +sys$schdwk +sys$setef +sys$setast +sys$setime +sys$setimr +sys$setpri +sys$setprn +sys$synch +sys$trnlnm +sys$waitfr +sys$wake Property changes on: trunk/vms/lib/vmsdll/vmsdll.def ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Modified: trunk/vms/lib/vmsdll/vmsdll.rc --- trunk/vms/lib/vmsdll/vmsdll.rc 2005-08-11 07:13:03 UTC (rev 17278) +++ trunk/vms/lib/vmsdll/vmsdll.rc 2005-08-11 08:46:57 UTC (rev 17279) @@ -1,4 +1,4 @@ -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS/VMS API Client Library\0" -#define REACTOS_STR_INTERNAL_NAME "vmsdll\0" -#define REACTOS_STR_ORIGINAL_FILENAME "vmdsll.dll\0" -#include <reactos/version.rc> +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS/VMS API Client Library\0" +#define REACTOS_STR_INTERNAL_NAME "vmsdll\0" +#define REACTOS_STR_ORIGINAL_FILENAME "vmdsll.dll\0" +#include <reactos/version.rc> Property changes on: trunk/vms/lib/vmsdll/vmsdll.rc ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Added: trunk/vms/lib/vmsdll/vmsdll.xml --- trunk/vms/lib/vmsdll/vmsdll.xml 2005-08-11 07:13:03 UTC (rev 17278) +++ trunk/vms/lib/vmsdll/vmsdll.xml 2005-08-11 08:46:57 UTC (rev 17279) @@ -0,0 +1,23 @@ +<module name="vmsdll" type="nativedll" installbase="system32" installname="vmsdll.dll"> + <bootstrap base="reactos/system32" /> + <importlibrary definition="vmsdll.def" /> + <include base="vmsdll">../include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="__USE_W32API" /> + <define name="_WIN32_WINNT">0x0502</define> + <define name="_NTOSKRNL_" /> + <library>rtl</library> + <library>intrlck</library> + <library>string</library> + <linkerflag>-lgcc</linkerflag> + <file>dllmain.c</file> + <directory name="lib"> + <file>stubs.c</file> + </directory> + <directory name="rms"> + <file>stubs.c</file> + </directory> + <directory name="sys"> + <file>stubs.c</file> + </directory> +</module> Property changes on: trunk/vms/lib/vmsdll/vmsdll.xml ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Modified: trunk/vms/makefile --- trunk/vms/makefile 2005-08-11 07:13:03 UTC (rev 17278) +++ trunk/vms/makefile 2005-08-11 08:46:57 UTC (rev 17279) @@ -1,120 +1,14 @@ -# $Id$ -# -# ReactOS VMS Personality -# - -PATH_TO_TOP = ../reactos - -include $(PATH_TO_TOP)/rules.mak - -VMS_PATH = . - -VMS_OTHER = server - -VMS_TOOLS = mksystab - -VMS_LIBS = vmsdll - -VMS_APPS = # vmsw32 - -VMS_MODULES = $(VMS_OTHER) $(VMS_TOOLS) $(VMS_LIBS) $(VMS_APPS) - -all: implib $(VMS_MODULES) - -implib: $(VMS_MODULES:%=%_implib) - -clean: $(VMS_MODULES:%=%_clean) - -install: $(VMS_MODULES:%=%_install) - -.PHONY: all implib clean - - -# -# Other VMS+ Modules -# -$(VMS_OTHER): %: - make -f Makefile -C $(VMS_PATH)/$* - -$(VMS_OTHER:%=%_implib): %_implib: - make -f Makefile -C $(VMS_PATH)/$* implib - -$(VMS_OTHER:%=%_clean): %_clean: - make -f Makefile -C $(VMS_PATH)/$* clean - -$(VMS_OTHER:%=%_dist): %_dist: - make -f Makefile -C $(VMS_PATH)/$* dist - -$(VMS_OTHER:%=%_install): %_install: - make -f Makefile -C $(VMS_PATH)/$* install - -.PHONY: $(VMS_OTHER) $(VMS_OTHER:%=%_implib) $(VMS_OTHER:%=%_clean) $(VMS_OTHER:%=%_install) $(VMS_OTHER:%=%_dist) - - -# -# VMS+ Tools -# -$(VMS_TOOLS): %: - make -f Makefile -C $(VMS_PATH)/tools/$* - -$(VMS_TOOLS:%=%_implib): %_implib: - make -f Makefile -C $(VMS_PATH)/tools/$* implib - -$(VMS_TOOLS:%=%_clean): %_clean: - make -f Makefile -C $(VMS_PATH)/tools/$* clean - -$(VMS_TOOLS:%=%_dist): %_dist: - make -f Makefile -C $(VMS_PATH)/tools/$* dist - -$(VMS_TOOLS:%=%_install): %_install: - make -f Makefile -C $(VMS_PATH)/tools/$* install - -.PHONY: $(VMS_LIBS) $(VMS_LIBS:%=%_implib) $(VMS_LIBS:%=%_clean) $(VMS_LIBS:%=%_install) $(VMS_LIBS:%=%_dist) - - -# -# VMS+ DLLs -# -$(VMS_LIBS): %: - make -f Makefile -C $(VMS_PATH)/lib/$* - -$(VMS_LIBS:%=%_implib): %_implib: - make -f Makefile -C $(VMS_PATH)/lib/$* implib - -$(VMS_LIBS:%=%_clean): %_clean: - make -f Makefile -C $(VMS_PATH)/lib/$* clean - -$(VMS_LIBS:%=%_dist): %_dist: - make -f Makefile -C $(VMS_PATH)/lib/$* dist - -$(VMS_LIBS:%=%_install): %_install: - make -f Makefile -C $(VMS_PATH)/lib/$* install - -.PHONY: $(VMS_LIBS) $(VMS_LIBS:%=%_implib) $(VMS_LIBS:%=%_clean) $(VMS_LIBS:%=%_install) $(VMS_LIBS:%=%_dist) - - -# -# VMS+ Programs -# -$(VMS_APPS): %: - make -f Makefile -C $(VMS_PATH)/apps/$* - -$(VMS_APPS:%=%_implib): %_implib: - make -f Makefile -C $(VMS_PATH)/apps/$* implib - -$(VMS_APPS:%=%_clean): %_clean: - make -f Makefile -C $(VMS_PATH)/apps/$* clean - -$(VMS_APPS:%=%_dist): %_dist: - make -f Makefile -C $(VMS_PATH)/apps/$* dist - -$(VMS_APPS:%=%_install): %_install: - make -f Makefile -C $(VMS_PATH)/apps/$* install - -.PHONY: $(VMS_APPS) $(VMS_APPS:%=%_implib) $(VMS_APPS:%=%_clean) $(VMS_APPS:%=%_install) $(VMS_APPS:%=%_dist) - - -etags: - find . -name "*.[ch]" -print | etags --language=c - - -# EOF +all: + @echo To build "vms" there are two paths: + @echo --- + @echo 1. copy the vms folder into the reactos\modules folder + @echo 2. link reactos/modules/vms to vms + @echo UNIX + @echo cd $${ROS_SRC_ROOT}/reactos/modules + @echo ln -s $${ROS_SRC_ROOT}/vms vms + @echo WINDOWS + @echo cd %%ROS_SRC_ROOT%%\reactos\modules + @echo junction vms %%ROS_SRC_ROOT%%\vms + @echo --- + @echo Eventually you can run "make depends" in the %%ROS_SRC_ROOT%%\reactos + @echo directory to compile it. Property changes on: trunk/vms/makefile ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/vms/readme.txt --- trunk/vms/readme.txt 2005-08-11 07:13:03 UTC (rev 17278) +++ trunk/vms/readme.txt 2005-08-11 08:46:57 UTC (rev 17279) @@ -0,0 +1,5 @@ +$Id$ + +This directory contains the ReactOS VMS personality. +Make sure you also have a copy of the rest of the ReactOS +source before you attempt to build anything in this module. Property changes on: trunk/vms/readme.txt ___________________________________________________________________ [truncated at 1000 lines; 744 more skipped]

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
67
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2005