Ros-diffs August 2005

ros-diffs@reactos.org

23 participants
669 discussions

[ea] 16958: RBuild 'project' document DTD (rough draft).

by ea＠svn.reactos.com

RBuild 'project' document DTD (rough draft). Added: trunk/reactos/tools/rbuild/project.dtd _____ Added: trunk/reactos/tools/rbuild/project.dtd --- trunk/reactos/tools/rbuild/project.dtd 2005-08-01 16:08:29 UTC (rev 16957) +++ trunk/reactos/tools/rbuild/project.dtd 2005-08-01 16:11:29 UTC (rev 16958) @@ -0,0 +1,107 @@ + +<!ENTITY % CIdentifier "CDATA"> +  +<!ENTITY % Text "CDATA"> +  + + + +<!ELEMENT xi:include (xi:fallback)*> +<!ATTLIST xi:include + href %Text; #REQUIRED +> + +<!ELEMENT xi:fallback (xi:include)> + + + +<!ELEMENT bootstrap ANY> +<!ATTLIST bootstrap + base %Text; #IMPLIED + nameoncd %Text; #IMPLIED +> + +<!ELEMENT cdfile ANY> +<!ATTLIST cdfile + base %Text; #IMPLIED + nameoncd %Text; #IMPLIED +> + +<!ELEMENT compilerflag (#PCDATA)> + +<!ELEMENT define EMPTY> +<!ATTLIST define + name %CIdentifier; #REQUIRED + value %Text; #IMPLIED +> + +<!ELEMENT directory (directory*|group*|file*|if*|module+|pch*|xi:include*)+> +<!ATTLIST directory + name %Text; #REQUIRED +> + +<!ELEMENT file (#PCDATA)> +<!ATTLIST file + first (true|false) "false" +> + +<!ELEMENT group (cdfile+|directory+|file+|property+)+> + +<!ELEMENT if (compilerflag*|define*|directory*|file*|if*|group*|property*)+> +<!ATTLIST if + property %CIdentifier; #REQUIRED + value %Text; #REQUIRED +> + +<!ELEMENT include (#PCDATA)> +<!ATTLIST include + base %Text; #IMPLIED +> + +<!ELEMENT importlibrary EMPTY> +<!ATTLIST importlibrary + definition %Text; #REQUIRED +> + +<!ELEMENT library ANY> + +<!ELEMENT linkerflag ANY> + +<!ELEMENT module (bootstrap*|importlibrary*|define*|include*|library*|directory*|file*|li nkerflag*)*> +<!ATTLIST module + if %Text; #IMPLIED + ifnot %Text; #IMPLIED + name %CIdentifier; #IMPLIED + type (buildtool|staticlibrary|objectlibrary|kernel|kernelmodedll|kernelmodedr iver|nativedll|win32dll|win32cui|win32gui|bootloader|bootsector|iso|test |rpcserver|rpcclient|alias) #REQUIRED + extension %CIdentifier; #IMPLIED + entrypoint %CIdentifier; #IMPLIED + baseaddress %CIdentifier; #IMPLIED + mangledsymbols %Text; #IMPLIED + installbase %Text; #IMPLIED + installname %Text; #IMPLIED + usewrc %Text; #IMPLIED + warnings %Text; #IMPLIED + aliasof %Text; #IMPLIED +> + +<!ELEMENT pch (#PCDATA)> + +<!ELEMENT project (compilerflag*|define*|group*|if*|include*|directory*|xi:include*)+> +<!ATTLIST project + name %Text; #FIXED "ReactOS" + makefile %Text; #FIXED "makefile.auto" + xmlns:xi %Text; #FIXED "http://www.w3.org/2001/XInclude" +> + +<!ELEMENT property EMPTY> +<!ATTLIST property + name %CIdentifier; #REQUIRED + value %Text; #REQUIRED +> + +<!ELEMENT symbol (#PCDATA)> +<!ATTLIST symbol + newname %Text; #IMPLIED +> + + Property changes on: trunk/reactos/tools/rbuild/project.dtd ___________________________________________________________________ Name: svn:keywords + author id date revision Name: svn:eol-style + native

19 years, 4 months

[ea] 16957: Replace 'Value' with 'Content' as per XML spec.

by ea＠svn.reactos.com

Replace 'Value' with 'Content' as per XML spec. Minor changes. Modified: trunk/reactos/tools/rbuild/doc/rbuild.dbk _____ Modified: trunk/reactos/tools/rbuild/doc/rbuild.dbk --- trunk/reactos/tools/rbuild/doc/rbuild.dbk 2005-08-01 15:21:40 UTC (rev 16956) +++ trunk/reactos/tools/rbuild/doc/rbuild.dbk 2005-08-01 16:08:29 UTC (rev 16957) @@ -14,7 +14,9 @@ </author> <othercredit> - <surname>Emanuele Aliberti</surname> + <firstname>Emanuele</firstname> + + <surname>Aliberti</surname> </othercredit> <copyright> @@ -127,7 +129,7 @@ </section> <section> - <title>Value</title> + <title>Content</title> <para>None.</para> </section> @@ -135,7 +137,7 @@ <section> <title>Children</title> - <para><link linkend="???">xi:fallback</link>.</para> + <para><link linkend="element.xi.fallback">xi:fallback</link>.</para> </section> </section> @@ -161,7 +163,7 @@ </section> <section> - <title>Value</title> + <title>Content</title> <para>None.</para> </section> @@ -220,7 +222,7 @@ </section> <section> - <title>Value</title> + <title>Content</title> <para>None.</para> </section> @@ -275,7 +277,7 @@ </section> <section> - <title>Value</title> + <title>Content</title> <para>Name of file.</para> </section> @@ -287,7 +289,7 @@ </section> </section> - <section> + <section id="element.compilerflag"> <title>Compilerflag element</title> <para>A compilerflag element specifies additional flags to be bassed @@ -306,7 +308,7 @@ </section> <section> - <title>Value</title> + <title>Content</title> <para>The compiler flags.</para> </section> @@ -356,7 +358,7 @@ </section> <section> - <title>Value</title> + <title>Content</title> <para>None.</para> </section> @@ -395,7 +397,7 @@ </section> <section> - <title>Value</title> + <title>Content</title> <para>Value of define. The value is optional.</para> </section> @@ -434,7 +436,7 @@ </section> <section> - <title>Value</title> + <title>Content</title> <para>Name of module.</para> </section> @@ -474,7 +476,7 @@ </section> <section> - <title>Value</title> + <title>Content</title> <para>None.</para> </section> @@ -518,7 +520,7 @@ </section> <section> - <title>Value</title> + <title>Content</title> <para>Name of file.</para> </section> @@ -537,7 +539,7 @@ </section> </section> - <section> + <section id="element.group"> <title>Group element</title> <para>A group element's purpose is grouping subelements.</para> @@ -560,7 +562,7 @@ </section> <section> - <title>Value</title> + <title>Content</title> <para>None.</para> </section> @@ -617,7 +619,7 @@ </section> <section> - <title>Value</title> + <title>Content</title> <para>None.</para> </section> @@ -673,7 +675,7 @@ </section> <section> - <title>Value</title> + <title>Content</title> <para>None.</para> </section> @@ -721,7 +723,7 @@ </section> <section> - <title>Value</title> + <title>Content</title> <para>Relative include directory.</para> </section> @@ -762,7 +764,7 @@ </section> <section> - <title>Value</title> + <title>Content</title> <para>None.</para> </section> @@ -808,7 +810,7 @@ </section> <section> - <title>Value</title> + <title>Content</title> <para>Name of file that is to be passed as a parameter to the build tool.</para> @@ -864,7 +866,7 @@ </section> <section> - <title>Value</title> + <title>Content</title> <para>Name of file.</para> </section> @@ -911,7 +913,7 @@ </section> <section> - <title>Value</title> + <title>Content</title> <para>None.</para> </section> @@ -974,7 +976,7 @@ </section> <section> - <title>Value</title> + <title>Content</title> <para>The switches to pass to the linker.</para> </section> @@ -1423,7 +1425,7 @@ </section> <section> - <title>Value</title> + <title>Content</title> <para>None.</para> </section> @@ -1476,7 +1478,7 @@ </section> <section> - <title>Value</title> + <title>Content</title> <para>None.</para> </section> @@ -1522,7 +1524,7 @@ </section> <section> - <title>Value</title> + <title>Content</title> <para>Name of file that is to be passed as a parameter to the build tool.</para> @@ -1559,7 +1561,7 @@ </section> <section> - <title>Value</title> + <title>Content</title> <para>Name of the include file to be precompiled.</para> </section> @@ -1616,7 +1618,7 @@ </section> <section> - <title>Value</title> + <title>Content</title> <para>None.</para> </section> @@ -1676,7 +1678,7 @@ </section> <section> - <title>Value</title> + <title>Content</title> <para>None.</para> </section> @@ -1722,7 +1724,7 @@ </section> <section> - <title>Value</title> + <title>Content</title> <para>Name of symbol.</para> </section>

19 years, 4 months

[weiden] 16956: revert my last changes, it seems to cause problems when building on *nix

by weiden＠svn.reactos.com

revert my last changes, it seems to cause problems when building on *nix Modified: trunk/reactos/tools/winebuild/import.c Modified: trunk/reactos/tools/winebuild/main.c Modified: trunk/reactos/tools/winebuild/parser.c Modified: trunk/reactos/tools/winebuild/relay.c Modified: trunk/reactos/tools/winebuild/res16.c Modified: trunk/reactos/tools/winebuild/res32.c Modified: trunk/reactos/tools/winebuild/spec16.c Modified: trunk/reactos/tools/winebuild/spec32.c Modified: trunk/reactos/tools/winebuild/utils.c _____ Modified: trunk/reactos/tools/winebuild/import.c --- trunk/reactos/tools/winebuild/import.c 2005-08-01 13:50:07 UTC (rev 16955) +++ trunk/reactos/tools/winebuild/import.c 2005-08-01 15:21:40 UTC (rev 16956) @@ -20,14 +20,12 @@ */ #include "config.h" -#include "wine/port.h" #include <ctype.h> #include <fcntl.h> #include <stdio.h> #include <string.h> #include <stdarg.h> -#include <stdlib.h> #ifdef HAVE_SYS_STAT_H # include <sys/stat.h> #endif _____ Modified: trunk/reactos/tools/winebuild/main.c --- trunk/reactos/tools/winebuild/main.c 2005-08-01 13:50:07 UTC (rev 16955) +++ trunk/reactos/tools/winebuild/main.c 2005-08-01 15:21:40 UTC (rev 16956) @@ -23,7 +23,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <stdio.h> _____ Modified: trunk/reactos/tools/winebuild/parser.c --- trunk/reactos/tools/winebuild/parser.c 2005-08-01 13:50:07 UTC (rev 16955) +++ trunk/reactos/tools/winebuild/parser.c 2005-08-01 15:21:40 UTC (rev 16956) @@ -23,7 +23,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <ctype.h> _____ Modified: trunk/reactos/tools/winebuild/relay.c --- trunk/reactos/tools/winebuild/relay.c 2005-08-01 13:50:07 UTC (rev 16955) +++ trunk/reactos/tools/winebuild/relay.c 2005-08-01 15:21:40 UTC (rev 16956) @@ -23,7 +23,6 @@ */ #include "config.h" -#include "wine/port.h" #include <ctype.h> _____ Modified: trunk/reactos/tools/winebuild/res16.c --- trunk/reactos/tools/winebuild/res16.c 2005-08-01 13:50:07 UTC (rev 16955) +++ trunk/reactos/tools/winebuild/res16.c 2005-08-01 15:21:40 UTC (rev 16956) @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <ctype.h> _____ Modified: trunk/reactos/tools/winebuild/res32.c --- trunk/reactos/tools/winebuild/res32.c 2005-08-01 13:50:07 UTC (rev 16955) +++ trunk/reactos/tools/winebuild/res32.c 2005-08-01 15:21:40 UTC (rev 16956) @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #include <ctype.h> #include <stdlib.h> _____ Modified: trunk/reactos/tools/winebuild/spec16.c --- trunk/reactos/tools/winebuild/spec16.c 2005-08-01 13:50:07 UTC (rev 16955) +++ trunk/reactos/tools/winebuild/spec16.c 2005-08-01 15:21:40 UTC (rev 16956) @@ -23,7 +23,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <ctype.h> _____ Modified: trunk/reactos/tools/winebuild/spec32.c --- trunk/reactos/tools/winebuild/spec32.c 2005-08-01 13:50:07 UTC (rev 16955) +++ trunk/reactos/tools/winebuild/spec32.c 2005-08-01 15:21:40 UTC (rev 16956) @@ -23,7 +23,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <ctype.h> _____ Modified: trunk/reactos/tools/winebuild/utils.c --- trunk/reactos/tools/winebuild/utils.c 2005-08-01 13:50:07 UTC (rev 16955) +++ trunk/reactos/tools/winebuild/utils.c 2005-08-01 15:21:40 UTC (rev 16956) @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #if !defined(WIN32) #undef strdup

19 years, 4 months

[navaraf] 16955: Various LdrGetProcedureAddress fixes:

by navaraf＠svn.reactos.com

Various LdrGetProcedureAddress fixes: - Fix the binary search limits. - Fix the comparsion of names (previously "XXX" and "XXXyyy" would be considered identical) and make it case sensitive. - Remove non-binary search, it's not needed. - Don't use ULONG to store pointers. Modified: trunk/reactos/ntoskrnl/ldr/rtl.c _____ Modified: trunk/reactos/ntoskrnl/ldr/rtl.c --- trunk/reactos/ntoskrnl/ldr/rtl.c 2005-08-01 13:34:33 UTC (rev 16954) +++ trunk/reactos/ntoskrnl/ldr/rtl.c 2005-08-01 13:50:07 UTC (rev 16955) @@ -24,84 +24,84 @@ OUT PVOID *ProcedureAddress) { PIMAGE_EXPORT_DIRECTORY ExportDir; + ULONG ExportDirSize = 0; PUSHORT OrdinalPtr; PULONG NamePtr; + PCHAR CurrentNamePtr; PULONG AddressPtr; - ULONG i = 0; + if (ProcedureAddress == NULL) + return STATUS_INVALID_PARAMETER; + /* get the pointer to the export directory */ - ExportDir = (PIMAGE_EXPORT_DIRECTORY) - RtlImageDirectoryEntryToData (BaseAddress, TRUE, - IMAGE_DIRECTORY_ENTRY_EXPORT, &i); + ExportDir = RtlImageDirectoryEntryToData(BaseAddress, TRUE, + IMAGE_DIRECTORY_ENTRY_EXPORT, + &ExportDirSize); - if (!ExportDir || !i || !ProcedureAddress) - { - return(STATUS_INVALID_PARAMETER); - } + if (ExportDir == NULL || ExportDirSize == 0) + return STATUS_INVALID_PARAMETER; - AddressPtr = (PULONG)RVA((char*)BaseAddress, ExportDir->AddressOfFunctions); + AddressPtr = (PULONG)RVA(BaseAddress, ExportDir->AddressOfFunctions); + if (Name && Name->Length) - { - LONG minn, maxn; + { + LONG minn, maxn, mid, res; - /* by name */ - OrdinalPtr = - (PUSHORT)RVA((char*)BaseAddress, ExportDir->AddressOfNameOrdinals); - NamePtr = (PULONG)RVA((char*)BaseAddress, ExportDir->AddressOfNames); + /* Search for export by name */ - minn = 0; maxn = ExportDir->NumberOfNames; - while (minn <= maxn) - { - LONG mid; - LONG res; + /* + * NOTE: Exports are always sorted and so we can apply binary search. + * Also the function names are _case sensitive_, so respect that. + * -- Filip Navara, August 1st, 2005 + */ - mid = (minn + maxn) / 2; - res = _strnicmp(Name->Buffer, (PCH)RVA((char*)BaseAddress, NamePtr[mid]), - Name->Length); - if (res == 0) - { - *ProcedureAddress = - (PVOID)RVA((char*)BaseAddress, AddressPtr[OrdinalPtr[mid]]); - return(STATUS_SUCCESS); - } - else if (res > 0) - { - maxn = mid - 1; - } - else - { - minn = mid + 1; - } - } + OrdinalPtr = (PUSHORT)RVA(BaseAddress, ExportDir->AddressOfNameOrdinals); + NamePtr = (PULONG)RVA(BaseAddress, ExportDir->AddressOfNames); - for (i = 0; i < ExportDir->NumberOfNames; i++, NamePtr++, OrdinalPtr++) - { - if (!_strnicmp(Name->Buffer, - (char*)((char*)BaseAddress + *NamePtr), Name->Length)) - { - *ProcedureAddress = - (PVOID)((ULONG)BaseAddress + - (ULONG)AddressPtr[*OrdinalPtr]); - return STATUS_SUCCESS; - } - } - CPRINT("LdrGetProcedureAddress: Can't resolve symbol '%Z'\n", Name); - } + minn = 0; maxn = ExportDir->NumberOfNames - 1; + while (minn <= maxn) + { + mid = (minn + maxn) / 2; + CurrentNamePtr = (PCHAR)RVA(BaseAddress, NamePtr[mid]); + res = strncmp(CurrentNamePtr, Name->Buffer, Name->Length); + if (res == 0) + { + /* + * Check if the beginning of the name matched, but it's still + * not the whole name. + */ + if (CurrentNamePtr[Name->Length] != 0) + { + res = -1; + } + else + { + *ProcedureAddress = (PVOID)RVA(BaseAddress, AddressPtr[OrdinalPtr[mid]]); + return STATUS_SUCCESS; + } + } + if (res > 0) + maxn = mid - 1; + else + minn = mid + 1; + } + + CPRINT("LdrGetProcedureAddress: Can't resolve symbol '%Z'\n", Name); + } else - { - /* by ordinal */ - Ordinal &= 0x0000FFFF; - if (Ordinal - ExportDir->Base < ExportDir->NumberOfFunctions) - { - *ProcedureAddress = - (PVOID)((ULONG)BaseAddress + - (ULONG)AddressPtr[Ordinal - ExportDir->Base]); - return STATUS_SUCCESS; - } - CPRINT("LdrGetProcedureAddress: Can't resolve symbol @%d\n", - Ordinal); - } + { + /* Search for export by ordinal */ + Ordinal &= 0x0000FFFF; + if (Ordinal - ExportDir->Base < ExportDir->NumberOfFunctions) + { + *ProcedureAddress = (PVOID)RVA(BaseAddress, AddressPtr[Ordinal - ExportDir->Base]); + return STATUS_SUCCESS; + } + + CPRINT("LdrGetProcedureAddress: Can't resolve symbol @%d\n", Ordinal); + } + return STATUS_PROCEDURE_NOT_FOUND; }

19 years, 4 months

[ea] 16954: First attempt to make the XML data we feed rbuild conforming the XInclude spec.

by ea＠svn.reactos.com

First attempt to make the XML data we feed rbuild conforming the XInclude spec. Modified: trunk/reactos/apps/utils/directory.xml Modified: trunk/reactos/baseaddress.xml Modified: trunk/reactos/bootdata/bootdata.xml Modified: trunk/reactos/drivers/directory.xml Modified: trunk/reactos/hal/directory.xml Modified: trunk/reactos/lib/directory.xml Modified: trunk/reactos/media/directory.xml Modified: trunk/reactos/modules/directory.xml Modified: trunk/reactos/regtests/directory.xml Modified: trunk/reactos/services/directory.xml Modified: trunk/reactos/subsys/directory.xml _____ Modified: trunk/reactos/apps/utils/directory.xml --- trunk/reactos/apps/utils/directory.xml 2005-08-01 13:27:02 UTC (rev 16953) +++ trunk/reactos/apps/utils/directory.xml 2005-08-01 13:34:33 UTC (rev 16954) @@ -1,3 +1,4 @@ +<group> <directory name="net"> <xi:include href="net/directory.xml" /> </directory> @@ -7,4 +8,4 @@ <directory name="ps"> <xi:include href="ps/ps.xml" /> </directory> - +</group> _____ Modified: trunk/reactos/baseaddress.xml --- trunk/reactos/baseaddress.xml 2005-08-01 13:27:02 UTC (rev 16953) +++ trunk/reactos/baseaddress.xml 2005-08-01 13:34:33 UTC (rev 16954) @@ -1,3 +1,4 @@ +<group> <property name="BASEADDRESS_REGTESTS" value="0x07000000" /> <property name="BASEADDRESS_NOTIFYHOOK" value="0x08000000" /> <property name="BASEADDRESS_DEVENUM" value="0x35680000" /> @@ -106,3 +107,4 @@ <property name="BASEADDRESS_PACKET" value="0x77780000" /> <property name="BASEADDRESS_IPRTPRIO" value="0x777c0000" /> <property name="BASEADDRESS_WSHTCPIP" value="0x777c0000" /> +</group> _____ Modified: trunk/reactos/bootdata/bootdata.xml --- trunk/reactos/bootdata/bootdata.xml 2005-08-01 13:27:02 UTC (rev 16953) +++ trunk/reactos/bootdata/bootdata.xml 2005-08-01 13:34:33 UTC (rev 16954) @@ -1,3 +1,4 @@ +<group> <cdfile>autorun.inf</cdfile> <cdfile>icon.ico</cdfile> <cdfile>readme.txt</cdfile> @@ -12,3 +13,4 @@ <directory name="livecd"> <xi:include href="livecd/livecd.xml" /> </directory> +</group> _____ Modified: trunk/reactos/drivers/directory.xml --- trunk/reactos/drivers/directory.xml 2005-08-01 13:27:02 UTC (rev 16953) +++ trunk/reactos/drivers/directory.xml 2005-08-01 13:34:33 UTC (rev 16954) @@ -1,3 +1,4 @@ +<group> <directory name="bus"> <xi:include href="bus/directory.xml" /> </directory> @@ -25,3 +26,4 @@ <directory name="usb"> <xi:include href="usb/directory.xml" /> </directory> +</group> _____ Modified: trunk/reactos/hal/directory.xml --- trunk/reactos/hal/directory.xml 2005-08-01 13:27:02 UTC (rev 16953) +++ trunk/reactos/hal/directory.xml 2005-08-01 13:34:33 UTC (rev 16954) @@ -1,3 +1,4 @@ +<group> <directory name="hal"> <xi:include href="hal/hal.xml" /> </directory> @@ -4,3 +5,4 @@ <directory name="halx86"> <xi:include href="halx86/directory.xml" /> </directory> +</group> _____ Modified: trunk/reactos/lib/directory.xml --- trunk/reactos/lib/directory.xml 2005-08-01 13:27:02 UTC (rev 16953) +++ trunk/reactos/lib/directory.xml 2005-08-01 13:34:33 UTC (rev 16954) @@ -1,3 +1,4 @@ +<group> <directory name="acledit"> <xi:include href="acledit/acledit.xml" /> </directory> @@ -316,3 +317,4 @@ <directory name="zlib"> <xi:include href="zlib/zlib.xml" /> </directory> +</group> _____ Modified: trunk/reactos/media/directory.xml --- trunk/reactos/media/directory.xml 2005-08-01 13:27:02 UTC (rev 16953) +++ trunk/reactos/media/directory.xml 2005-08-01 13:34:33 UTC (rev 16954) @@ -1,3 +1,4 @@ +<group> <directory name="drivers"> <xi:include href="drivers/directory.xml" /> </directory> @@ -10,3 +11,4 @@ <directory name="nls"> <xi:include href="nls/nls.xml" /> </directory> +</group> _____ Modified: trunk/reactos/modules/directory.xml --- trunk/reactos/modules/directory.xml 2005-08-01 13:27:02 UTC (rev 16953) +++ trunk/reactos/modules/directory.xml 2005-08-01 13:34:33 UTC (rev 16954) @@ -1,3 +1,4 @@ +<group> <directory name="posix"> <xi:include href="posix/directory.xml"> <xi:fallback> @@ -26,3 +27,4 @@ </xi:fallback> </xi:include> </directory> +</group> _____ Modified: trunk/reactos/regtests/directory.xml --- trunk/reactos/regtests/directory.xml 2005-08-01 13:27:02 UTC (rev 16953) +++ trunk/reactos/regtests/directory.xml 2005-08-01 13:34:33 UTC (rev 16954) @@ -1,3 +1,4 @@ +<group> <directory name="regtests"> <xi:include href="regtests/regtests.xml" /> </directory> @@ -4,3 +5,4 @@ <directory name="shared"> <xi:include href="shared/rtshared.xml" /> </directory> +</group> _____ Modified: trunk/reactos/services/directory.xml --- trunk/reactos/services/directory.xml 2005-08-01 13:27:02 UTC (rev 16953) +++ trunk/reactos/services/directory.xml 2005-08-01 13:34:33 UTC (rev 16954) @@ -1,3 +1,4 @@ +<group> <directory name="eventlog"> <xi:include href="eventlog/eventlog.xml" /> </directory> @@ -7,3 +8,4 @@ <directory name="umpnpmgr"> <xi:include href="umpnpmgr/umpnpmgr.xml" /> </directory> +</group> _____ Modified: trunk/reactos/subsys/directory.xml --- trunk/reactos/subsys/directory.xml 2005-08-01 13:27:02 UTC (rev 16953) +++ trunk/reactos/subsys/directory.xml 2005-08-01 13:34:33 UTC (rev 16954) @@ -1,3 +1,4 @@ +<group> <directory name="csrss"> <xi:include href="csrss/csrss.xml" /> </directory> @@ -13,3 +14,4 @@ <directory name="win32k"> <xi:include href="win32k/win32k.xml" /> </directory> +</group>

19 years, 4 months

[weiden] 16953: fixed uninitialized variable warning

by weiden＠svn.reactos.com

fixed uninitialized variable warning Modified: trunk/reactos/apps/utils/net/ftp/ftp.c _____ Modified: trunk/reactos/apps/utils/net/ftp/ftp.c --- trunk/reactos/apps/utils/net/ftp/ftp.c 2005-08-01 13:01:58 UTC (rev 16952) +++ trunk/reactos/apps/utils/net/ftp/ftp.c 2005-08-01 13:27:02 UTC (rev 16953) @@ -724,7 +724,7 @@ void recvrequest(char *cmd, char *local, char *remote, char *mode, int printnames) { - FILE *fout; + FILE *fout = stdout; int din = 0; int (*closefunc)(), _pclose(), fclose(); void (*oldintr)(int), (*oldintp)(int);

19 years, 4 months

[weiden] 16952: revert back to -Os because of some buggy versions of GCC

by weiden＠svn.reactos.com

revert back to -Os because of some buggy versions of GCC Modified: trunk/reactos/ReactOS.xml _____ Modified: trunk/reactos/ReactOS.xml --- trunk/reactos/ReactOS.xml 2005-08-01 12:57:34 UTC (rev 16951) +++ trunk/reactos/ReactOS.xml 2005-08-01 13:01:58 UTC (rev 16952) @@ -18,7 +18,7 @@ <property name="DBG_OR_KDBG" value="true" /> </if> <if property="DBG" value="0"> - <compilerflag>-O3</compilerflag> + <compilerflag>-Os</compilerflag> <compilerflag>-Wno-strict-aliasing</compilerflag> <compilerflag>-ftracer</compilerflag> <compilerflag>-momit-leaf-frame-pointer</compilerflag>

19 years, 4 months

[weiden] 16951: compile release builds with -O3 instead of -Os because it catches more mistakes

by weiden＠svn.reactos.com

compile release builds with -O3 instead of -Os because it catches more mistakes Modified: trunk/reactos/ReactOS.xml Modified: trunk/reactos/drivers/bus/serenum/fdo.c Modified: trunk/reactos/lib/adns/adns.xml Modified: trunk/reactos/lib/twain/twain_32.xml Modified: trunk/reactos/ntoskrnl/io/device.c Modified: trunk/reactos/subsys/system/usetup/usetup.xml _____ Modified: trunk/reactos/ReactOS.xml --- trunk/reactos/ReactOS.xml 2005-08-01 12:54:50 UTC (rev 16950) +++ trunk/reactos/ReactOS.xml 2005-08-01 12:57:34 UTC (rev 16951) @@ -18,7 +18,7 @@ <property name="DBG_OR_KDBG" value="true" /> </if> <if property="DBG" value="0"> - <compilerflag>-Os</compilerflag> + <compilerflag>-O3</compilerflag> <compilerflag>-Wno-strict-aliasing</compilerflag> <compilerflag>-ftracer</compilerflag> <compilerflag>-momit-leaf-frame-pointer</compilerflag> _____ Modified: trunk/reactos/drivers/bus/serenum/fdo.c --- trunk/reactos/drivers/bus/serenum/fdo.c 2005-08-01 12:54:50 UTC (rev 16950) +++ trunk/reactos/drivers/bus/serenum/fdo.c 2005-08-01 12:57:34 UTC (rev 16951) @@ -187,7 +187,7 @@ { case BusRelations: { - PDEVICE_RELATIONS DeviceRelations; + PDEVICE_RELATIONS DeviceRelations = NULL; DPRINT("Serenum: IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / BusRelations\n"); Status = SerenumFdoQueryBusRelations(DeviceObject, &DeviceRelations); Information = (ULONG_PTR)DeviceRelations; _____ Modified: trunk/reactos/lib/adns/adns.xml --- trunk/reactos/lib/adns/adns.xml 2005-08-01 12:54:50 UTC (rev 16950) +++ trunk/reactos/lib/adns/adns.xml 2005-08-01 12:57:34 UTC (rev 16951) @@ -1,4 +1,4 @@ -<module name="adns" type="staticlibrary"> +<module name="adns" type="staticlibrary" warnings="true"> <include base="adns">src</include> <include base="adns">adns_win32</include> <define name="__USE_W32API" /> _____ Modified: trunk/reactos/lib/twain/twain_32.xml --- trunk/reactos/lib/twain/twain_32.xml 2005-08-01 12:54:50 UTC (rev 16950) +++ trunk/reactos/lib/twain/twain_32.xml 2005-08-01 12:57:34 UTC (rev 16951) @@ -1,4 +1,4 @@ -<module name="twain_32" type="win32dll" baseaddress="${BASEADDRESS_TWAIN_32}" installbase="system32" installname="twain_32.dll"> +<module name="twain_32" type="win32dll" baseaddress="${BASEADDRESS_TWAIN_32}" installbase="system32" installname="twain_32.dll" warnings="true"> <importlibrary definition="twain_32.def" /> <include base="twain_32">.</include> <define name="__USE_W32API" /> _____ Modified: trunk/reactos/ntoskrnl/io/device.c --- trunk/reactos/ntoskrnl/io/device.c 2005-08-01 12:54:50 UTC (rev 16950) +++ trunk/reactos/ntoskrnl/io/device.c 2005-08-01 12:57:34 UTC (rev 16951) @@ -251,8 +251,8 @@ PDEVICE_OBJECT *AttachedDevice) { NTSTATUS Status; - PFILE_OBJECT FileObject; - PDEVICE_OBJECT TargetDevice; + PFILE_OBJECT FileObject = NULL; + PDEVICE_OBJECT TargetDevice = NULL; /* Call the helper routine for an attach operation */ DPRINT("IoAttachDevice\n"); _____ Modified: trunk/reactos/subsys/system/usetup/usetup.xml --- trunk/reactos/subsys/system/usetup/usetup.xml 2005-08-01 12:54:50 UTC (rev 16950) +++ trunk/reactos/subsys/system/usetup/usetup.xml 2005-08-01 12:57:34 UTC (rev 16951) @@ -5,6 +5,7 @@ <define name="__USE_W32API" /> <define name="_DISABLE_TIDENTS" /> <define name="_WIN32_WINNT">0x0502</define> + <define name="__NO_CTYPE_INLINES" /> <linkerflag>-lgcc</linkerflag> <library>zlib</library> <library>vfatlib</library>

19 years, 4 months

[ea] 16950: Add reference to the 'compilerflag' element.

by ea＠svn.reactos.com

Add reference to the 'compilerflag' element. Add reference to the 'group' element. Add Parents section to more elements. Modified: trunk/reactos/tools/rbuild/doc/rbuild.dbk _____ Modified: trunk/reactos/tools/rbuild/doc/rbuild.dbk --- trunk/reactos/tools/rbuild/doc/rbuild.dbk 2005-08-01 12:51:20 UTC (rev 16949) +++ trunk/reactos/tools/rbuild/doc/rbuild.dbk 2005-08-01 12:54:50 UTC (rev 16950) @@ -226,6 +226,12 @@ </section> <section> + <title>Parents</title> + + <para><link linkend="element.module">module</link>.</para> + </section> + + <section> <title>Children</title> <para>None.</para> @@ -281,6 +287,44 @@ </section> </section> + <section> + <title>Compilerflag element</title> + + <para>A compilerflag element specifies additional flags to be bassed + to the compiler.</para> + + <section> + <title>Syntax</title> + + <para><programlisting><compilerflags><replaceable>-Wpointer-arith< /replaceable></compilerflag></programlisting></para> + </section> + + <section> + <title>Attributes.</title> + + <para>None.</para> + </section> + + <section> + <title>Value</title> + + <para>The compiler flags.</para> + </section> + + <section> + <title>Parents</title> + + <para><link linkend="element.if">if</link>, <link + linkend="element.project">project</link>.</para> + </section> + + <section> + <title>Children</title> + + <para>None.</para> + </section> + </section> + <section id="element.component"> <title>Component element</title> @@ -357,6 +401,13 @@ </section> <section> + <title>Parents</title> + + <para><link linkend="element.project">project</link>, <link + linkend="element.module">module</link>.</para> + </section> + + <section> <title>Children</title> <para>None.</para> @@ -429,6 +480,14 @@ </section> <section> + <title>Parents</title> + + <para><link linkend="element.directory">directory</link>, <link + linkend="element.directory">if</link>, <link + linkend="element.project">project</link>.</para> + </section> + + <section> <title>Children</title> <para><link linkend="element.cdfile">cdfile</link>, <link @@ -465,12 +524,60 @@ </section> <section> + <title>Parents</title> + + <para><link linkend="element.directory">directory</link>, <link + linkend="element.module">module</link>.</para> + </section> + + <section> <title>Children</title> <para>None.</para> </section> </section> + <section> + <title>Group element</title> + + <para>A group element's purpose is grouping subelements.</para> + + <section> + <title>Syntax</title> + + <para><programlisting><group> + <file><replaceable>i386-dis.c</replaceable></file> + <file><replaceable>kdb_help.S</replaceable></file> + <file><replaceable>longjmp.S</replaceable></file> + <file><replaceable>setjmp.S</replaceable></file> +</group></programlisting></para> + </section> + + <section> + <title>Attributes</title> + + <para>None.</para> + </section> + + <section> + <title>Value</title> + + <para>None.</para> + </section> + + <section> + <title>Parents</title> + + <para><link linkend="element.if">if</link>.</para> + </section> + + <section> + <title>Children</title> + + <para><link linkend="element.file">file</link>.</para> + </section> + </section> + <section id="element.if"> <title>If element</title> @@ -516,6 +623,13 @@ </section> <section> + <title>Parents</title> + + <para><link linkend="element.project">project</link>, <link + linkend="element.directory">directory</link>.</para> + </section> + + <section> <title>Children</title> <para><link linkend="element.compilerflag">compilerflag</link>, @@ -565,6 +679,12 @@ </section> <section> + <title>Parents</title> + + <para><link linkend="element.module">module</link>.</para> + </section> + + <section> <title>Children</title> <para>None.</para> @@ -607,6 +727,13 @@ </section> <section> + <title>Parents</title> + + <para><link linkend="element.project">project</link>, <link + linkend="element.module">module</link>.</para> + </section> + + <section> <title>Children</title> <para>None.</para> @@ -853,6 +980,12 @@ </section> <section> + <title>Parents</title> + + <para><link linkend="element.module">module</link>.</para> + </section> + + <section> <title>Children</title> <para>None.</para> @@ -1298,7 +1431,8 @@ <section> <title>Parents</title> - <para><link linkend="element.project">project</link>.</para> + <para><link linkend="element.project">project</link>, <link + linkend="element.directory">directory</link>.</para> </section> <section> @@ -1315,6 +1449,7 @@ linkend="element.include">include</link>, <link linkend="element.invoke">invoke</link>, <link linkend="element.library">library</link>, <link + linkend="element.linkerflag">linkerflag</link>, <link linkend="element.property">property</link>.</para> </section> </section> @@ -1430,6 +1565,12 @@ </section> <section> + <title>Parents</title> + + <para><link linkend="element.directory">directory</link>.</para> + </section> + + <section> <title>Children</title> <para>None.</para>

19 years, 4 months

[weiden] 16949: temporarily disable -Werror for tools, there seem to be differences between versions of gcc issuing some warnings

by weiden＠svn.reactos.com

temporarily disable -Werror for tools, there seem to be differences between versions of gcc issuing some warnings Modified: trunk/reactos/tools/tools.mak _____ Modified: trunk/reactos/tools/tools.mak --- trunk/reactos/tools/tools.mak 2005-08-01 11:59:22 UTC (rev 16948) +++ trunk/reactos/tools/tools.mak 2005-08-01 12:51:20 UTC (rev 16949) @@ -5,8 +5,8 @@ TOOLS_OUT = $(OUTPUT_)$(TOOLS_BASE) TOOLS_OUT_ = $(TOOLS_OUT)$(SEP) -TOOLS_CFLAGS = -Werror -Wall -Wpointer-arith -Wno-strict-aliasing -TOOLS_CPPFLAGS = -Werror -Wall -Wpointer-arith +TOOLS_CFLAGS = -Wall -Wpointer-arith -Wno-strict-aliasing +TOOLS_CPPFLAGS = -Wall -Wpointer-arith TOOLS_LFLAGS = $(TOOLS_INT): | $(INTERMEDIATE)

19 years, 4 months

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 August 2005