Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 32461: don't free the memory for the palette entries in IntSetPalette. Fixes bug 3072 See issue #3072 for more details.
by tkreuzer＠svn.reactos.org 24 Feb '08

24 Feb '08

Author: tkreuzer Date: Sun Feb 24 06:12:38 2008 New Revision: 32461 URL: http://svn.reactos.org/svn/reactos?rev=32461&view=rev Log: don't free the memory for the palette entries in IntSetPalette. Fixes bug 3072 See issue #3072 for more details. Modified: trunk/reactos/drivers/video/displays/framebuf/palette.c Modified: trunk/reactos/drivers/video/displays/framebuf/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf/palette.c (original) +++ trunk/reactos/drivers/video/displays/framebuf/palette.c Sun Feb 24 06:12:38 2008 @@ -121,7 +121,6 @@ pClut->FirstEntry = iStart; pClut->NumEntries = cColors; memcpy(&pClut->LookupTable[0].RgbLong, ppalent, sizeof(ULONG) * cColors); - EngFreeMem(ppalent); if (((PPDEV)dhpdev)->PaletteShift) { @@ -193,5 +192,7 @@ return FALSE; } - return IntSetPalette(dhpdev, PaletteEntries, iStart, cColors); + BOOL bRet = IntSetPalette(dhpdev, PaletteEntries, iStart, cColors); + EngFreeMem(PaletteEntries); + return bRet; }

1 0

[pschweitzer] 32460: [FORMATTING] Fix indentation (only for functional code)
by pschweitzer＠svn.reactos.org 23 Feb '08

23 Feb '08

Author: pschweitzer Date: Sun Feb 24 00:52:30 2008 New Revision: 32460 URL: http://svn.reactos.org/svn/reactos?rev=32460&view=rev Log: [FORMATTING] Fix indentation (only for functional code) Modified: trunk/reactos/drivers/filesystems/ntfs/dirctl.c Modified: trunk/reactos/drivers/filesystems/ntfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/dirctl.c (original) +++ trunk/reactos/drivers/filesystems/ntfs/dirctl.c Sun Feb 24 00:52:30 2008 @@ -514,55 +514,55 @@ if (SearchPattern != NULL) - { + { + if (!Ccb->DirectorySearchPattern) + { + First = TRUE; + Ccb->DirectorySearchPattern = + ExAllocatePoolWithTag(NonPagedPool, SearchPattern->Length + sizeof(WCHAR), TAG_NTFS); if (!Ccb->DirectorySearchPattern) - { - First = TRUE; - Ccb->DirectorySearchPattern = - ExAllocatePoolWithTag(NonPagedPool, SearchPattern->Length + sizeof(WCHAR), TAG_NTFS); - if (!Ccb->DirectorySearchPattern) - { - return(STATUS_INSUFFICIENT_RESOURCES); - } - - memcpy(Ccb->DirectorySearchPattern, - SearchPattern->Buffer, - SearchPattern->Length); - Ccb->DirectorySearchPattern[SearchPattern->Length / sizeof(WCHAR)] = 0; - } - } + { + return(STATUS_INSUFFICIENT_RESOURCES); + } + + memcpy(Ccb->DirectorySearchPattern, + SearchPattern->Buffer, + SearchPattern->Length); + Ccb->DirectorySearchPattern[SearchPattern->Length / sizeof(WCHAR)] = 0; + } + } else if (!Ccb->DirectorySearchPattern) - { - First = TRUE; - Ccb->DirectorySearchPattern = ExAllocatePoolWithTag(NonPagedPool, 2 * sizeof(WCHAR), TAG_NTFS); - if (!Ccb->DirectorySearchPattern) - { - return(STATUS_INSUFFICIENT_RESOURCES); - } - Ccb->DirectorySearchPattern[0] = L'*'; - Ccb->DirectorySearchPattern[1] = 0; - } + { + First = TRUE; + Ccb->DirectorySearchPattern = ExAllocatePoolWithTag(NonPagedPool, 2 * sizeof(WCHAR), TAG_NTFS); + if (!Ccb->DirectorySearchPattern) + { + return(STATUS_INSUFFICIENT_RESOURCES); + } + Ccb->DirectorySearchPattern[0] = L'*'; + Ccb->DirectorySearchPattern[1] = 0; + } DPRINT("Search pattern '%S'\n", Ccb->DirectorySearchPattern); /* Determine directory index */ if (Stack->Flags & SL_INDEX_SPECIFIED) - { - Ccb->Entry = Ccb->CurrentByteOffset.u.LowPart; - } + { + Ccb->Entry = Ccb->CurrentByteOffset.u.LowPart; + } else if (First || (Stack->Flags & SL_RESTART_SCAN)) - { - Ccb->Entry = 0; - } + { + Ccb->Entry = 0; + } /* Determine Buffer for result */ if (Irp->MdlAddress) - { - Buffer = MmGetSystemAddressForMdl(Irp->MdlAddress); - } + { + Buffer = MmGetSystemAddressForMdl(Irp->MdlAddress); + } else - { - Buffer = Irp->UserBuffer; - } + { + Buffer = Irp->UserBuffer; + } DPRINT("Buffer=%p tofind=%S\n", Buffer, Ccb->DirectorySearchPattern); #if 0 TempFcb.ObjectName = TempFcb.PathName; @@ -653,14 +653,14 @@ #endif if (Buffer0) - { - Buffer0->NextEntryOffset = 0; - } + { + Buffer0->NextEntryOffset = 0; + } if (FileIndex > 0) - { - Status = STATUS_SUCCESS; - } + { + Status = STATUS_SUCCESS; + } // return(Status); return(STATUS_NO_MORE_FILES); @@ -670,7 +670,7 @@ NTSTATUS NTAPI NtfsFsdDirectoryControl(PDEVICE_OBJECT DeviceObject, - PIRP Irp) + PIRP Irp) { PIO_STACK_LOCATION Stack; NTSTATUS Status; @@ -680,22 +680,22 @@ Stack = IoGetCurrentIrpStackLocation(Irp); switch (Stack->MinorFunction) - { - case IRP_MN_QUERY_DIRECTORY: - Status = NtfsQueryDirectory(DeviceObject, - Irp); - break; - - case IRP_MN_NOTIFY_CHANGE_DIRECTORY: - DPRINT1("IRP_MN_NOTIFY_CHANGE_DIRECTORY\n"); - Status = STATUS_NOT_IMPLEMENTED; - break; - - default: - DPRINT1("NTFS: MinorFunction %d\n", Stack->MinorFunction); - Status = STATUS_INVALID_DEVICE_REQUEST; - break; - } + { + case IRP_MN_QUERY_DIRECTORY: + Status = NtfsQueryDirectory(DeviceObject, + Irp); + break; + + case IRP_MN_NOTIFY_CHANGE_DIRECTORY: + DPRINT1("IRP_MN_NOTIFY_CHANGE_DIRECTORY\n"); + Status = STATUS_NOT_IMPLEMENTED; + break; + + default: + DPRINT1("NTFS: MinorFunction %d\n", Stack->MinorFunction); + Status = STATUS_INVALID_DEVICE_REQUEST; + break; + } Irp->IoStatus.Status = Status; Irp->IoStatus.Information = 0;

1 0

[cfinck] 32459: - Add the architecture-specific defines back to the .rbuild files. At the current state, there is no reason for them to be automatically added by rbuild. - Add back NTOSKRNL_SHARED as well, it's not the same value for i386 and PPC - Remove SILLY_DEFINE :D
by cfinck＠svn.reactos.org 23 Feb '08

23 Feb '08

Author: cfinck Date: Sat Feb 23 22:13:35 2008 New Revision: 32459 URL: http://svn.reactos.org/svn/reactos?rev=32459&view=rev Log: - Add the architecture-specific defines back to the .rbuild files. At the current state, there is no reason for them to be automatically added by rbuild. - Add back NTOSKRNL_SHARED as well, it's not the same value for i386 and PPC - Remove SILLY_DEFINE :D Modified: branches/rbuild/reactos/ReactOS-i386.rbuild branches/rbuild/reactos/ReactOS-ppc.rbuild branches/rbuild/reactos/tools/rbuild/backend/mingw/modulehandler.cpp branches/rbuild/reactos/tools/rbuild/project.cpp Modified: branches/rbuild/reactos/ReactOS-i386.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/ReactOS-i386.rbu… ============================================================================== --- branches/rbuild/reactos/ReactOS-i386.rbuild (original) +++ branches/rbuild/reactos/ReactOS-i386.rbuild Sat Feb 23 22:13:35 2008 @@ -9,6 +9,12 @@ <xi:include href="ReactOS-generic.rbuild" /> + <define name="_M_IX86" /> + <define name="_X86_" /> + <define name="__i386__" /> + + <property name="NTOSKRNL_SHARED" value="-Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -shared"/> + <if property="GDB" value="0"> <if property="OPTIMIZE" value="1"> <compilerflag>-Os</compilerflag> @@ -37,10 +43,4 @@ <compilerflag>-Wno-strict-aliasing</compilerflag> <compilerflag>-Wpointer-arith</compilerflag> <linkerflag>-enable-stdcall-fixup</linkerflag> - - - <overridemodule name="ntoskrnl" allowwarnings="true"> - <define name="SILLY_DEFINE" /> - </overridemodule> - </project> Modified: branches/rbuild/reactos/ReactOS-ppc.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/ReactOS-ppc.rbui… ============================================================================== --- branches/rbuild/reactos/ReactOS-ppc.rbuild (original) +++ branches/rbuild/reactos/ReactOS-ppc.rbuild Sat Feb 23 22:13:35 2008 @@ -8,6 +8,10 @@ </xi:include> <xi:include href="ReactOS-generic.rbuild" /> + + <define name="_M_PPC" /> + <define name="_PPC_" /> + <define name="__PowerPC__" /> <property name="MKHIVE_OPTIONS" value="-be" /> <property name="OFWLDR_LINKFORMAT" value="-L$(INTERMEDIATE)/lib/ppcmmu -lppcmmu_code -nostdlib -nostartfiles -lgcc -Wl,-e,__start -Wl,-Ttext,0xe00000 -N"/> Modified: branches/rbuild/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/bac… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Sat Feb 23 22:13:35 2008 @@ -2615,7 +2615,7 @@ module.baseaddress.c_str () ); GenerateLinkerCommand ( dependencies, "${gcc}", - linkerParameters + " -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -shared", + linkerParameters + " $(NTOSKRNL_SHARED)", objectsMacro, libsMacro, "-sections" ); Modified: branches/rbuild/reactos/tools/rbuild/project.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/pro… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/project.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/project.cpp Sat Feb 23 22:13:35 2008 @@ -477,43 +477,6 @@ cdfiles[i]->ProcessXML (); for ( i = 0; i < installfiles.size (); i++ ) installfiles[i]->ProcessXML (); - - switch (architectureType) - { - case I386: - { - Define* pDefine = new Define (*this, "_M_IX86" ); - non_if_data.defines.push_back ( pDefine ); - - pDefine = new Define (*this, "_X86_" ); - non_if_data.defines.push_back ( pDefine ); - - pDefine = new Define (*this, "__i386__" ); - non_if_data.defines.push_back ( pDefine ); - } - break; - case PowerPC: - { - Define* pDefine = new Define (*this, "_M_PPC" ); - non_if_data.defines.push_back ( pDefine ); - - pDefine = new Define (*this, "_PPC_" ); - non_if_data.defines.push_back ( pDefine ); - - pDefine = new Define (*this, "__PowerPC__" ); - non_if_data.defines.push_back ( pDefine ); - } - break; - case ARM: - { - Define* pDefine = new Define (*this, "_ARM_" ); - non_if_data.defines.push_back ( pDefine ); - - pDefine = new Define (*this, "__arm__" ); - non_if_data.defines.push_back ( pDefine ); - } - break; - } } ArchitectureType

1 0

[dchapyshev] 32458: - Fix formatting - Update all languages - Delete non-translated files
by dchapyshev＠svn.reactos.org 23 Feb '08

23 Feb '08

Author: dchapyshev Date: Sat Feb 23 20:48:50 2008 New Revision: 32458 URL: http://svn.reactos.org/svn/reactos?rev=32458&view=rev Log: - Fix formatting - Update all languages - Delete non-translated files Removed: trunk/reactos/dll/cpl/intl/lang/cs-CZ.rc trunk/reactos/dll/cpl/intl/lang/el-GR.rc trunk/reactos/dll/cpl/intl/lang/hu-HU.rc trunk/reactos/dll/cpl/intl/lang/id-ID.rc trunk/reactos/dll/cpl/intl/lang/ja-JP.rc trunk/reactos/dll/cpl/intl/lang/nl-NL.rc trunk/reactos/dll/cpl/intl/lang/sv-SE.rc Modified: trunk/reactos/dll/cpl/intl/generalp.c trunk/reactos/dll/cpl/intl/intl.c trunk/reactos/dll/cpl/intl/intl.h trunk/reactos/dll/cpl/intl/intl.rbuild trunk/reactos/dll/cpl/intl/intl.rc trunk/reactos/dll/cpl/intl/lang/bg-BG.rc trunk/reactos/dll/cpl/intl/lang/de-DE.rc trunk/reactos/dll/cpl/intl/lang/en-US.rc trunk/reactos/dll/cpl/intl/lang/es-ES.rc trunk/reactos/dll/cpl/intl/lang/fr-FR.rc trunk/reactos/dll/cpl/intl/lang/it-IT.rc trunk/reactos/dll/cpl/intl/lang/pl-PL.rc trunk/reactos/dll/cpl/intl/lang/ru-RU.rc trunk/reactos/dll/cpl/intl/lang/uk-UA.rc trunk/reactos/dll/cpl/intl/resource.h trunk/reactos/dll/cpl/intl/rsrc.rc trunk/reactos/dll/cpl/intl/time.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/cpl/intl/generalp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/generalp.c?re… Modified: trunk/reactos/dll/cpl/intl/intl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.c?rev=32… Modified: trunk/reactos/dll/cpl/intl/intl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.h?rev=32… Modified: trunk/reactos/dll/cpl/intl/intl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.rbuild?r… Modified: trunk/reactos/dll/cpl/intl/intl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.rc?rev=3… Modified: trunk/reactos/dll/cpl/intl/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/bg-BG.rc… Removed: trunk/reactos/dll/cpl/intl/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/cs-CZ.rc… Modified: trunk/reactos/dll/cpl/intl/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/de-DE.rc… Removed: trunk/reactos/dll/cpl/intl/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/el-GR.rc… Modified: trunk/reactos/dll/cpl/intl/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/en-US.rc… Modified: trunk/reactos/dll/cpl/intl/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/es-ES.rc… Modified: trunk/reactos/dll/cpl/intl/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/fr-FR.rc… Removed: trunk/reactos/dll/cpl/intl/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/hu-HU.rc… Removed: trunk/reactos/dll/cpl/intl/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/id-ID.rc… Modified: trunk/reactos/dll/cpl/intl/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/it-IT.rc… Removed: trunk/reactos/dll/cpl/intl/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/ja-JP.rc… Removed: trunk/reactos/dll/cpl/intl/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/nl-NL.rc… Modified: trunk/reactos/dll/cpl/intl/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/pl-PL.rc… Modified: trunk/reactos/dll/cpl/intl/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/ru-RU.rc… Removed: trunk/reactos/dll/cpl/intl/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/sv-SE.rc… Modified: trunk/reactos/dll/cpl/intl/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/uk-UA.rc… Modified: trunk/reactos/dll/cpl/intl/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/resource.h?re… Modified: trunk/reactos/dll/cpl/intl/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/rsrc.rc?rev=3… Modified: trunk/reactos/dll/cpl/intl/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/time.c?rev=32…

1 0

[mpiulachs] 32457: - Add autorun.arm as suggested by Steven - Automatically open \readme.txt on platforms not supported by Reactos
by mpiulachs＠svn.reactos.org 23 Feb '08

23 Feb '08

Author: mpiulachs Date: Sat Feb 23 16:46:45 2008 New Revision: 32457 URL: http://svn.reactos.org/svn/reactos?rev=32457&view=rev Log: - Add autorun.arm as suggested by Steven - Automatically open \readme.txt on platforms not supported by Reactos Modified: branches/rbuild/reactos/boot/bootdata/autorun.inf Modified: branches/rbuild/reactos/boot/bootdata/autorun.inf URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/boot/bootdata/au… ============================================================================== --- branches/rbuild/reactos/boot/bootdata/autorun.inf (original) +++ branches/rbuild/reactos/boot/bootdata/autorun.inf Sat Feb 23 16:46:45 2008 @@ -2,18 +2,28 @@ open=i386\welcome.exe icon=icon.ico - -[autorun.mips] - -open=mips\welcome.exe -icon=icon.ico - -[autorun.alpha] - -open=alpha\welcome.exe -icon=icon.ico +label=ReactOS [autorun.ppc] open=ppc\welcome.exe -icon=icon.ico +icon=icon.ico +label=ReactOS + +[autorun.arm] + +open=arm\welcome.exe +icon=icon.ico +label=ReactOS + +[autorun.mips] + +ShellExecute=readme.txt +icon=icon.ico +label=ReactOS + +[autorun.alpha] + +ShellExecute=readme.txt +icon=icon.ico +label=ReactOS

1 0

[spetreolle] 32456: add missing winetests : hlink & schannel, .rbuild fixes
by spetreolle＠svn.reactos.org 22 Feb '08

22 Feb '08

Author: spetreolle Date: Sat Feb 23 00:01:47 2008 New Revision: 32456 URL: http://svn.reactos.org/svn/reactos?rev=32456&view=rev Log: add missing winetests : hlink & schannel, .rbuild fixes Modified: trunk/rostests/apitests/directory.rbuild trunk/rostests/apitests/w32kdll/directory.rbuild trunk/rostests/directory.rbuild trunk/rostests/drivers/directory.rbuild trunk/rostests/dxtest/directory.rbuild trunk/rostests/regtests_by_casper/directory.rbuild trunk/rostests/regtests_by_casper/shared/rtshared.rbuild trunk/rostests/tests/D3DParseUnknownCommand_show/D3DParseUnknownCommand_show.rbuild trunk/rostests/tests/directory.rbuild trunk/rostests/win32/testsets.rbuild trunk/rostests/winetests/directory.rbuild Modified: trunk/rostests/apitests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/directory.rbuild… ============================================================================== --- trunk/rostests/apitests/directory.rbuild (original) +++ trunk/rostests/apitests/directory.rbuild Sat Feb 23 00:01:47 2008 @@ -1,22 +1,26 @@ -<module name="apitest" type="staticlibrary"> - <include base="apitest">.</include> - <define name="__USE_W32API" /> - <define name="_WIN32_WINNT">0x0501</define> - <file>apitest.c</file> -</module> - -<directory name="gdi32api"> - <xi:include href="gdi32api/gdi32api.rbuild" /> -</directory> - -<directory name="user32api"> - <xi:include href="user32api/user32api.rbuild" /> -</directory> - -<directory name="w32kdll"> - <xi:include href="w32kdll/directory.rbuild" /> -</directory> - -<directory name="w32knapi"> - <xi:include href="w32knapi/w32knapi.rbuild" /> -</directory> +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> +<group xmlns:xi="http://www.w3.org/2001/XInclude"> + <module name="apitest" type="staticlibrary"> + <include base="apitest">.</include> + <define name="__USE_W32API" /> + <define name="_WIN32_WINNT">0x0501</define> + <file>apitest.c</file> + </module> + + <directory name="gdi32api"> + <xi:include href="gdi32api/gdi32api.rbuild" /> + </directory> + + <directory name="user32api"> + <xi:include href="user32api/user32api.rbuild" /> + </directory> + + <directory name="w32kdll"> + <xi:include href="w32kdll/directory.rbuild" /> + </directory> + + <directory name="w32knapi"> + <xi:include href="w32knapi/w32knapi.rbuild" /> + </directory> +</group> Modified: trunk/rostests/apitests/w32kdll/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/director… ============================================================================== --- trunk/rostests/apitests/w32kdll/directory.rbuild (original) +++ trunk/rostests/apitests/w32kdll/directory.rbuild Sat Feb 23 00:01:47 2008 @@ -1,19 +1,23 @@ -<directory name="w32kdll_ros"> - <xi:include href="w32kdll_ros/w32kdll_ros.rbuild" /> -</directory> - -<directory name="w32kdll_xpsp2"> - <xi:include href="w32kdll_xpsp2/w32kdll_xpsp2.rbuild" /> -</directory> - -<directory name="w32kdll_2ksp4"> - <xi:include href="w32kdll_2ksp4/w32kdll_2ksp4.rbuild" /> -</directory> - -<directory name="w32kdll_2k3sp2"> - <xi:include href="w32kdll_2k3sp2/w32kdll_2k3sp2.rbuild" /> -</directory> - -<directory name="w32kdll_vista"> - <xi:include href="w32kdll_vista/w32kdll_vista.rbuild" /> -</directory> +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> +<group xmlns:xi="http://www.w3.org/2001/XInclude"> + <directory name="w32kdll_ros"> + <xi:include href="w32kdll_ros/w32kdll_ros.rbuild" /> + </directory> + + <directory name="w32kdll_xpsp2"> + <xi:include href="w32kdll_xpsp2/w32kdll_xpsp2.rbuild" /> + </directory> + + <directory name="w32kdll_2ksp4"> + <xi:include href="w32kdll_2ksp4/w32kdll_2ksp4.rbuild" /> + </directory> + + <directory name="w32kdll_2k3sp2"> + <xi:include href="w32kdll_2k3sp2/w32kdll_2k3sp2.rbuild" /> + </directory> + + <directory name="w32kdll_vista"> + <xi:include href="w32kdll_vista/w32kdll_vista.rbuild" /> + </directory> +</group> Modified: trunk/rostests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/directory.rbuild?rev=3245… ============================================================================== --- trunk/rostests/directory.rbuild (original) +++ trunk/rostests/directory.rbuild Sat Feb 23 00:01:47 2008 @@ -1,21 +1,25 @@ -<directory name="drivers"> - <xi:include href="drivers/directory.rbuild" /> -</directory> -<directory name="dxtest"> - <xi:include href="dxtest/directory.rbuild" /> -</directory> -<directory name="regtests_by_casper"> - <xi:include href="regtests_by_casper/directory.rbuild" /> -</directory> -<directory name="tests"> - <xi:include href="tests/directory.rbuild" /> -</directory> -<directory name="win32"> - <xi:include href="win32/testsets.rbuild" /> -</directory> -<directory name="winetests"> - <xi:include href="winetests/directory.rbuild" /> -</directory> -<directory name="apitests"> - <xi:include href="apitests/directory.rbuild" /> -</directory> +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> +<group xmlns:xi="http://www.w3.org/2001/XInclude"> + <directory name="drivers"> + <xi:include href="drivers/directory.rbuild" /> + </directory> + <directory name="dxtest"> + <xi:include href="dxtest/directory.rbuild" /> + </directory> + <directory name="regtests_by_casper"> + <xi:include href="regtests_by_casper/directory.rbuild" /> + </directory> + <directory name="tests"> + <xi:include href="tests/directory.rbuild" /> + </directory> + <directory name="win32"> + <xi:include href="win32/testsets.rbuild" /> + </directory> + <directory name="winetests"> + <xi:include href="winetests/directory.rbuild" /> + </directory> + <directory name="apitests"> + <xi:include href="apitests/directory.rbuild" /> + </directory> +</group> Modified: trunk/rostests/drivers/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/directory.rbuild?… ============================================================================== --- trunk/rostests/drivers/directory.rbuild (original) +++ trunk/rostests/drivers/directory.rbuild Sat Feb 23 00:01:47 2008 @@ -1,9 +1,13 @@ -<directory name="csqtest"> - <xi:include href="csqtest/csqtest.rbuild" /> -</directory> -<directory name="kmtest"> - <xi:include href="kmtest/kmtest.rbuild" /> -</directory> -<directory name="memtest"> - <xi:include href="memtest/memtest.rbuild" /> -</directory> +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> +<group xmlns:xi="http://www.w3.org/2001/XInclude"> + <directory name="csqtest"> + <xi:include href="csqtest/csqtest.rbuild" /> + </directory> + <directory name="kmtest"> + <xi:include href="kmtest/kmtest.rbuild" /> + </directory> + <directory name="memtest"> + <xi:include href="memtest/memtest.rbuild" /> + </directory> +</group> Modified: trunk/rostests/dxtest/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/directory.rbuild?r… ============================================================================== --- trunk/rostests/dxtest/directory.rbuild (original) +++ trunk/rostests/dxtest/directory.rbuild Sat Feb 23 00:01:47 2008 @@ -1,8 +1,10 @@ -<directory name="ddraw"> - <xi:include href="ddraw/ddraw.rbuild" /> -</directory> - -<directory name="win32kdxtest"> - <xi:include href="win32kdxtest/win32kdxtest.rbuild" /> -</directory> - +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> +<group xmlns:xi="http://www.w3.org/2001/XInclude"> + <directory name="ddraw"> + <xi:include href="ddraw/ddraw.rbuild" /> + </directory> + <directory name="win32kdxtest"> + <xi:include href="win32kdxtest/win32kdxtest.rbuild" /> + </directory> +</group> Modified: trunk/rostests/regtests_by_casper/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/regtests_by_casper/direct… ============================================================================== --- trunk/rostests/regtests_by_casper/directory.rbuild (original) +++ trunk/rostests/regtests_by_casper/directory.rbuild Sat Feb 23 00:01:47 2008 @@ -1,6 +1,10 @@ -<directory name="regtests"> - <xi:include href="regtests/regtests.rbuild" /> -</directory> -<directory name="shared"> - <xi:include href="shared/rtshared.rbuild" /> -</directory> +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> +<group xmlns:xi="http://www.w3.org/2001/XInclude"> + <directory name="regtests"> + <xi:include href="regtests/regtests.rbuild" /> + </directory> + <directory name="shared"> + <xi:include href="shared/rtshared.rbuild" /> + </directory> +</group> Modified: trunk/rostests/regtests_by_casper/shared/rtshared.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/regtests_by_casper/shared… ============================================================================== --- trunk/rostests/regtests_by_casper/shared/rtshared.rbuild (original) +++ trunk/rostests/regtests_by_casper/shared/rtshared.rbuild Sat Feb 23 00:01:47 2008 @@ -1,4 +1,4 @@ -<module name="rtshared" type="staticlibrary"> +<module name="rtshared" type="staticlibrary" allowwarnings="true"> <include base="rtshared">.</include> <define name="__USE_W32API" /> <file>regtests.c</file> Modified: trunk/rostests/tests/D3DParseUnknownCommand_show/D3DParseUnknownCommand_show.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/D3DParseUnknownComm… ============================================================================== --- trunk/rostests/tests/D3DParseUnknownCommand_show/D3DParseUnknownCommand_show.rbuild (original) +++ trunk/rostests/tests/D3DParseUnknownCommand_show/D3DParseUnknownCommand_show.rbuild Sat Feb 23 00:01:47 2008 @@ -1,4 +1,4 @@ -<module name="D3DParseUnknownCommand_show" type="win32cui" installbase="bin" installname="D3DParseUnknownCommand_show.exe" allowwarnings="true"> +<module name="D3DParseUnknownCommand_show" type="win32cui" installbase="bin" installname="D3DParseUnknownCommand_show.exe"> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> @@ -7,4 +7,4 @@ <library>ddraw</library> <library>user32</library> <file>main.c</file> -</module> +</module> Modified: trunk/rostests/tests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/directory.rbuild?re… ============================================================================== --- trunk/rostests/tests/directory.rbuild (original) +++ trunk/rostests/tests/directory.rbuild Sat Feb 23 00:01:47 2008 @@ -1,281 +1,283 @@ -<directory name="accelerator"> - <xi:include href="accelerator/accelerator.rbuild" /> -</directory> -<directory name="alive"> - <xi:include href="alive/alive.rbuild" /> -</directory> -<directory name="alphablend"> - <xi:include href="alphablend/alphablend.rbuild" /> -</directory> -<directory name="apc"> - <xi:include href="apc/apc.rbuild" /> -</directory> -<directory name="apc2"> - <xi:include href="apc2/apc2.rbuild" /> -</directory> -<directory name="args"> - <xi:include href="args/args.rbuild" /> -</directory> -<directory name="atomtest"> - <xi:include href="atomtest/atomtest.rbuild" /> -</directory> -<directory name="bench"> - <xi:include href="bench/bench.rbuild" /> -</directory> -<directory name="bitblt"> - <xi:include href="bitblt/bitblt.rbuild" /> -</directory> -<directory name="button"> - <xi:include href="button/button.rbuild" /> -</directory> -<directory name="button2"> - <xi:include href="button2/button2.rbuild" /> -</directory> -<directory name="capclock"> - <xi:include href="capclock/capclock.rbuild" /> -</directory> -<directory name="carets"> - <xi:include href="carets/carets.rbuild" /> -</directory> -<directory name="combotst"> - <xi:include href="combotst/combotst.rbuild" /> -</directory> -<directory name="consume"> - <xi:include href="consume/consume.rbuild" /> -</directory> -<directory name="copymove"> - <xi:include href="copymove/copymove.rbuild" /> -</directory> -<directory name="count"> - <xi:include href="count/count.rbuild" /> -</directory> -<directory name="create-links"> - <xi:include href="create-links/create-links.rbuild" /> -</directory> -<directory name="dibtest"> - <xi:include href="dibtest/dibtest.rbuild" /> -</directory> -<directory name="dirdlg"> - <xi:include href="dirdlg/dirdlg.rbuild" /> -</directory> -<directory name="diskspeed"> - <xi:include href="diskspeed/diskspeed.rbuild" /> -</directory> -<directory name="dnsapi"> - <xi:include href="dnsapi/dnsapi.rbuild" /> -</directory> -<directory name="dnsquery"> - <xi:include href="dnsquery/dnsquery.rbuild" /> -</directory> -<directory name="D3DParseUnknownCommand_show"> - <xi:include href="D3DParseUnknownCommand_show/D3DParseUnknownCommand_show.rbuild" /> -</directory> -<directory name="DxHalTest"> - <xi:include href="DxHalTest/DxHalTest.rbuild" /> -</directory> -<directory name="edit"> - <xi:include href="edit/edit.rbuild" /> -</directory> -<directory name="enhmetafile"> - <xi:include href="enhmetafile/enhmetafile.rbuild" /> -</directory> -<directory name="enumfonts"> - <xi:include href="enumfonts/enumfonts.rbuild" /> -</directory> -<directory name="enumwnd"> - <xi:include href="enumwnd/enumwnd.rbuild" /> -</directory> -<directory name="enumws"> - <xi:include href="enumws/enumws.rbuild" /> -</directory> -<directory name="event"> - <xi:include href="event/event.rbuild" /> -</directory> -<directory name="fiber"> - <xi:include href="fiber/fiber.rbuild" /> -</directory> -<directory name="gethostbyname"> - <xi:include href="gethostbyname/gethostbyname.rbuild" /> -</directory> -<directory name="global_mem"> - <xi:include href="global_mem/global_mem.rbuild" /> -</directory> -<directory name="gradient"> - <xi:include href="gradient/gradient.rbuild" /> -</directory> +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> +<group xmlns:xi="http://www.w3.org/2001/XInclude"> + <directory name="accelerator"> + <xi:include href="accelerator/accelerator.rbuild" /> + </directory> + <directory name="alive"> + <xi:include href="alive/alive.rbuild" /> + </directory> + <directory name="alphablend"> + <xi:include href="alphablend/alphablend.rbuild" /> + </directory> + <directory name="apc"> + <xi:include href="apc/apc.rbuild" /> + </directory> + <directory name="apc2"> + <xi:include href="apc2/apc2.rbuild" /> + </directory> + <directory name="args"> + <xi:include href="args/args.rbuild" /> + </directory> + <directory name="atomtest"> + <xi:include href="atomtest/atomtest.rbuild" /> + </directory> + <directory name="bench"> + <xi:include href="bench/bench.rbuild" /> + </directory> + <directory name="bitblt"> + <xi:include href="bitblt/bitblt.rbuild" /> + </directory> + <directory name="button"> + <xi:include href="button/button.rbuild" /> + </directory> + <directory name="button2"> + <xi:include href="button2/button2.rbuild" /> + </directory> + <directory name="capclock"> + <xi:include href="capclock/capclock.rbuild" /> + </directory> + <directory name="carets"> + <xi:include href="carets/carets.rbuild" /> + </directory> + <directory name="combotst"> + <xi:include href="combotst/combotst.rbuild" /> + </directory> + <directory name="consume"> + <xi:include href="consume/consume.rbuild" /> + </directory> + <directory name="copymove"> + <xi:include href="copymove/copymove.rbuild" /> + </directory> + <directory name="count"> + <xi:include href="count/count.rbuild" /> + </directory> + <directory name="create-links"> + <xi:include href="create-links/create-links.rbuild" /> + </directory> + <directory name="dibtest"> + <xi:include href="dibtest/dibtest.rbuild" /> + </directory> + <directory name="dirdlg"> + <xi:include href="dirdlg/dirdlg.rbuild" /> + </directory> + <directory name="diskspeed"> + <xi:include href="diskspeed/diskspeed.rbuild" /> + </directory> + <directory name="dnsapi"> + <xi:include href="dnsapi/dnsapi.rbuild" /> + </directory> + <directory name="dnsquery"> + <xi:include href="dnsquery/dnsquery.rbuild" /> + </directory> + <directory name="D3DParseUnknownCommand_show"> + <xi:include href="D3DParseUnknownCommand_show/D3DParseUnknownCommand_show.rbuild" /> + </directory> + <directory name="DxHalTest"> + <xi:include href="DxHalTest/DxHalTest.rbuild" /> + </directory> + <directory name="edit"> + <xi:include href="edit/edit.rbuild" /> + </directory> + <directory name="enhmetafile"> + <xi:include href="enhmetafile/enhmetafile.rbuild" /> + </directory> + <directory name="enumfonts"> + <xi:include href="enumfonts/enumfonts.rbuild" /> + </directory> + <directory name="enumwnd"> + <xi:include href="enumwnd/enumwnd.rbuild" /> + </directory> + <directory name="enumws"> + <xi:include href="enumws/enumws.rbuild" /> + </directory> + <directory name="event"> + <xi:include href="event/event.rbuild" /> + </directory> + <directory name="fiber"> + <xi:include href="fiber/fiber.rbuild" /> + </directory> + <directory name="gethostbyname"> + <xi:include href="gethostbyname/gethostbyname.rbuild" /> + </directory> + <directory name="global_mem"> + <xi:include href="global_mem/global_mem.rbuild" /> + </directory> + <directory name="gradient"> + <xi:include href="gradient/gradient.rbuild" /> + </directory>  -<directory name="hello"> - <xi:include href="hello/hello.rbuild" /> -</directory> -<directory name="hivetest"> - <xi:include href="hivetest/hivetest.rbuild" /> -</directory> -<directory name="icontest"> - <xi:include href="icontest/icontest.rbuild" /> -</directory> -<directory name="Imagelistviewer"> - <xi:include href="Imagelistviewer/imagelistviewer.rbuild" /> -</directory> - + <directory name="hello"> + <xi:include href="hello/hello.rbuild" /> + </directory> + <directory name="hivetest"> + <xi:include href="hivetest/hivetest.rbuild" /> + </directory> + <directory name="icontest"> + <xi:include href="icontest/icontest.rbuild" /> + </directory> + <directory name="Imagelistviewer"> + <xi:include href="Imagelistviewer/imagelistviewer.rbuild" /> + </directory> +  -<directory name="isotest"> - <xi:include href="isotest/isotest.rbuild" /> -</directory> + <directory name="isotest"> + <xi:include href="isotest/isotest.rbuild" /> + </directory>  -<directory name="lineclip"> - <xi:include href="lineclip/lineclip.rbuild" /> -</directory> -<directory name="linetest"> - <xi:include href="linetest/linetest.rbuild" /> -</directory> + <directory name="lineclip"> + <xi:include href="lineclip/lineclip.rbuild" /> + </directory> + <directory name="linetest"> + <xi:include href="linetest/linetest.rbuild" /> + </directory>  -<directory name="map_dup_inherit"> - <xi:include href="map_dup_inherit/map_dup_inherit.rbuild" /> -</directory> -<directory name="mdi"> - <xi:include href="mdi/mdi.rbuild" /> -</directory> -<directory name="miditest"> - <xi:include href="miditest/miditest.rbuild" /> -</directory> -<directory name="mktime"> - <xi:include href="mktime/mktime.rbuild" /> -</directory> -<directory name="moztest"> - <xi:include href="moztest/moztest.rbuild" /> -</directory> + <directory name="map_dup_inherit"> + <xi:include href="map_dup_inherit/map_dup_inherit.rbuild" /> + </directory> + <directory name="mdi"> + <xi:include href="mdi/mdi.rbuild" /> + </directory> + <directory name="miditest"> + <xi:include href="miditest/miditest.rbuild" /> + </directory> + <directory name="mktime"> + <xi:include href="mktime/mktime.rbuild" /> + </directory> + <directory name="moztest"> + <xi:include href="moztest/moztest.rbuild" /> + </directory>  -<directory name="multithrdwin"> - <xi:include href="multithrdwin/multithrdwin.rbuild" /> -</directory> -<directory name="multiwin"> - <xi:include href="multiwin/multiwin.rbuild" /> -</directory> -<directory name="mutex"> - <xi:include href="mutex/mutex.rbuild" /> -</directory> -<directory name="nameserverlist"> - <xi:include href="nameserverlist/nameserverlist.rbuild" /> -</directory> -<directory name="noexecute"> - <xi:include href="noexecute/noexecute.rbuild" /> -</directory> + <directory name="multithrdwin"> + <xi:include href="multithrdwin/multithrdwin.rbuild" /> + </directory> + <directory name="multiwin"> + <xi:include href="multiwin/multiwin.rbuild" /> + </directory> + <directory name="mutex"> + <xi:include href="mutex/mutex.rbuild" /> + </directory> + <directory name="nameserverlist"> + <xi:include href="nameserverlist/nameserverlist.rbuild" /> + </directory> + <directory name="noexecute"> + <xi:include href="noexecute/noexecute.rbuild" /> + </directory>   -<directory name="palbitblt"> - <xi:include href="palbitblt/palbitblt.rbuild" /> -</directory> -<directory name="patblt"> - <xi:include href="patblt/patblt.rbuild" /> -</directory> -<directory name="polytest"> - <xi:include href="polytest/polytest.rbuild" /> -</directory> -<directory name="popupmenu"> - <xi:include href="popupmenu/popupmenu.rbuild" /> -</directory> -<directory name="primitives"> - <xi:include href="primitives/primitives.rbuild" /> -</directory> + <directory name="palbitblt"> + <xi:include href="palbitblt/palbitblt.rbuild" /> + </directory> + <directory name="patblt"> + <xi:include href="patblt/patblt.rbuild" /> + </directory> + <directory name="polytest"> + <xi:include href="polytest/polytest.rbuild" /> + </directory> + <directory name="popupmenu"> + <xi:include href="popupmenu/popupmenu.rbuild" /> + </directory> + <directory name="primitives"> + <xi:include href="primitives/primitives.rbuild" /> + </directory>  -<directory name="p_dup_handle"> - <xi:include href="p_dup_handle/p_dup_handle.rbuild" /> -</directory> - -<directory name="readconsole"> - <xi:include href="readconsole/readconsole.rbuild" /> -</directory> + <directory name="p_dup_handle"> + <xi:include href="p_dup_handle/p_dup_handle.rbuild" /> + </directory> + <directory name="readconsole"> + <xi:include href="readconsole/readconsole.rbuild" /> + </directory>  -<directory name="regqueryvalue"> - <xi:include href="regqueryvalue/regqueryvalue.rbuild" /> -</directory> + <directory name="regqueryvalue"> + <xi:include href="regqueryvalue/regqueryvalue.rbuild" /> + </directory>  -<directory name="sectest"> - <xi:include href="sectest/sectest.rbuild" /> -</directory> -<directory name="sertest"> - <xi:include href="sertest/sertest.rbuild" /> -</directory> -<directory name="shaptest"> - <xi:include href="shaptest/shaptest.rbuild" /> -</directory> + <directory name="sectest"> + <xi:include href="sectest/sectest.rbuild" /> + </directory> + <directory name="sertest"> + <xi:include href="sertest/sertest.rbuild" /> + </directory> + <directory name="shaptest"> + <xi:include href="shaptest/shaptest.rbuild" /> + </directory>  -<directory name="statst"> - <xi:include href="statst/statst.rbuild" /> -</directory> -<directory name="statst2"> - <xi:include href="statst2/statst2.rbuild" /> -</directory> -<directory name="stretchblt"> - <xi:include href="stretchblt/stretchblt.rbuild" /> -</directory> -<directory name="subclass"> - <xi:include href="subclass/subclass.rbuild" /> -</directory> -<directory name="suspend"> - <xi:include href="suspend/suspend.rbuild" /> -</directory> -<directory name="tcpsvr"> - <xi:include href="tcpsvr/tcpsvr.rbuild" /> -</directory> -<directory name="terminate"> - <xi:include href="terminate/terminate.rbuild" /> -</directory> -<directory name="thread"> - <xi:include href="thread/thread.rbuild" /> -</directory> -<directory name="threadwait"> - <xi:include href="threadwait/threadwait.rbuild" /> -</directory> -<directory name="thread_msg"> - <xi:include href="thread_msg/thread_msg.rbuild" /> -</directory> -<directory name="tmrqueue"> - <xi:include href="tmrqueue/tmrqueue.rbuild" /> -</directory> + <directory name="statst"> + <xi:include href="statst/statst.rbuild" /> + </directory> + <directory name="statst2"> + <xi:include href="statst2/statst2.rbuild" /> + </directory> + <directory name="stretchblt"> + <xi:include href="stretchblt/stretchblt.rbuild" /> + </directory> + <directory name="subclass"> + <xi:include href="subclass/subclass.rbuild" /> + </directory> + <directory name="suspend"> + <xi:include href="suspend/suspend.rbuild" /> + </directory> + <directory name="tcpsvr"> + <xi:include href="tcpsvr/tcpsvr.rbuild" /> + </directory> + <directory name="terminate"> + <xi:include href="terminate/terminate.rbuild" /> + </directory> + <directory name="thread"> + <xi:include href="thread/thread.rbuild" /> + </directory> + <directory name="threadwait"> + <xi:include href="threadwait/threadwait.rbuild" /> + </directory> + <directory name="thread_msg"> + <xi:include href="thread_msg/thread_msg.rbuild" /> + </directory> + <directory name="tmrqueue"> + <xi:include href="tmrqueue/tmrqueue.rbuild" /> + </directory>  -<directory name="txtscale"> - <xi:include href="txtscale/txtscale.rbuild" /> -</directory> -<directory name="vmtest"> - <xi:include href="vmtest/vmtest.rbuild" /> -</directory> -<directory name="wclickat"> - <xi:include href="wclickat/wclickat.rbuild" /> -</directory> -<directory name="winhello"> - <xi:include href="winhello/winhello.rbuild" /> -</directory> -<directory name="wm_erasebkgnd"> - <xi:include href="wm_erasebkgnd/wm_erasebkgnd.rbuild" /> -</directory> -<directory name="wm_paint"> - <xi:include href="wm_paint/wm_paint.rbuild" /> -</directory> + <directory name="txtscale"> + <xi:include href="txtscale/txtscale.rbuild" /> + </directory> + <directory name="vmtest"> + <xi:include href="vmtest/vmtest.rbuild" /> + </directory> + <directory name="wclickat"> + <xi:include href="wclickat/wclickat.rbuild" /> + </directory> + <directory name="winhello"> + <xi:include href="winhello/winhello.rbuild" /> + </directory> + <directory name="wm_erasebkgnd"> + <xi:include href="wm_erasebkgnd/wm_erasebkgnd.rbuild" /> + </directory> + <directory name="wm_paint"> + <xi:include href="wm_paint/wm_paint.rbuild" /> + </directory>   - +</group> Modified: trunk/rostests/win32/testsets.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/testsets.rbuild?rev… ============================================================================== --- trunk/rostests/win32/testsets.rbuild (original) +++ trunk/rostests/win32/testsets.rbuild Sat Feb 23 00:01:47 2008 @@ -13,7 +13,7 @@ <directory name="user32"> <xi:include href="user32/user32.rbuild" /> </directory> -<directory name="win32k"> + </group> Modified: trunk/rostests/winetests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/directory.rbuil… ============================================================================== --- trunk/rostests/winetests/directory.rbuild (original) +++ trunk/rostests/winetests/directory.rbuild Sat Feb 23 00:01:47 2008 @@ -1,101 +1,115 @@ -<group> -<directory name="advapi32"> - <xi:include href="advapi32/advapi32.rbuild" /> -</directory> -<directory name="advpack"> - <xi:include href="advpack/advpack.rbuild" /> -</directory> -<directory name="browseui"> - <xi:include href="browseui/browseui.rbuild" /> -</directory> -<directory name="cabinet"> - <xi:include href="cabinet/cabinet.rbuild" /> -</directory> -<directory name="comcat"> - <xi:include href="comcat/comcat.rbuild" /> -</directory> -<directory name="comctl32"> - <xi:include href="comctl32/comctl32.rbuild" /> -</directory> -<directory name="comdlg32"> - <xi:include href="comdlg32/comdlg32.rbuild" /> -</directory> -<directory name="gdi32"> - <xi:include href="gdi32/gdi32.rbuild" /> -</directory> -<directory name="icmp"> - <xi:include href="icmp/icmp.rbuild" /> -</directory> -<directory name="kernel32"> - <xi:include href="kernel32/kernel32.rbuild" /> -</directory> -<directory name="lz32"> - <xi:include href="lz32/lz32.rbuild" /> -</directory> -<directory name="mapi32"> - <xi:include href="mapi32/mapi32.rbuild" /> -</directory> -<directory name="mlang"> - <xi:include href="mlang/mlang.rbuild" /> -</directory> -<directory name="msi"> - <xi:include href="msi/msi.rbuild" /> -</directory> -<directory name="msvcrt"> - <xi:include href="msvcrt/msvcrt.rbuild" /> -</directory> -<directory name="netapi32"> - <xi:include href="netapi32/netapi32.rbuild" /> -</directory> -<directory name="ntdll"> - <xi:include href="ntdll/ntdll.rbuild" /> -</directory> -<directory name="odbccp32"> - <xi:include href="odbccp32/odbccp32.rbuild" /> -</directory> -<directory name="psapi"> - <xi:include href="psapi/psapi.rbuild" /> -</directory> -<directory name="powrprof"> - <xi:include href="powrprof/powrprof.rbuild" /> -</directory> -<directory name="riched20"> - <xi:include href="riched20/riched20.rbuild" /> -</directory> -<directory name="rpcrt4"> - <xi:include href="rpcrt4/rpcrt4.rbuild" /> -</directory> -<directory name="rsabase"> - <xi:include href="rsabase/rsabase.rbuild" /> -</directory> -<directory name="rsaenh"> - <xi:include href="rsaenh/rsaenh.rbuild" /> -</directory> -<directory name="setupapi"> - <xi:include href="setupapi/setupapi.rbuild" /> -</directory> -<directory name="shell32"> - <xi:include href="shell32/shell32.rbuild" /> -</directory> -<directory name="shlwapi"> - <xi:include href="shlwapi/shlwapi.rbuild" /> -</directory> -<directory name="urlmon"> - <xi:include href="urlmon/urlmon.rbuild" /> -</directory> -<directory name="user32"> - <xi:include href="user32/user32.rbuild" /> -</directory> -<directory name="usp10"> - <xi:include href="usp10/usp10.rbuild" /> -</directory> -<directory name="uxtheme"> - <xi:include href="uxtheme/uxtheme.rbuild" /> -</directory> -<directory name="version"> - <xi:include href="version/version.rbuild" /> -</directory> -<directory name="wininet"> - <xi:include href="wininet/wininet.rbuild" /> -</directory> +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> +<group xmlns:xi="http://www.w3.org/2001/XInclude"> + <directory name="advapi32"> + <xi:include href="advapi32/advapi32.rbuild" /> + </directory> + <directory name="advpack"> + <xi:include href="advpack/advpack.rbuild" /> + </directory> + <directory name="browseui"> + <xi:include href="browseui/browseui.rbuild" /> + </directory> + <directory name="cabinet"> + <xi:include href="cabinet/cabinet.rbuild" /> + </directory> + <directory name="comcat"> + <xi:include href="comcat/comcat.rbuild" /> + </directory> + <directory name="comctl32"> + <xi:include href="comctl32/comctl32.rbuild" /> + </directory> + <directory name="comdlg32"> + <xi:include href="comdlg32/comdlg32.rbuild" /> + </directory> + <directory name="gdi32"> + <xi:include href="gdi32/gdi32.rbuild" /> + </directory> + <directory name="hlink"> + <xi:include href="hlink/hlink.rbuild" /> + </directory> + <directory name="icmp"> + <xi:include href="icmp/icmp.rbuild" /> + </directory> + <directory name="kernel32"> + <xi:include href="kernel32/kernel32.rbuild" /> + </directory> + <directory name="lz32"> + <xi:include href="lz32/lz32.rbuild" /> + </directory> + <directory name="mapi32"> + <xi:include href="mapi32/mapi32.rbuild" /> + </directory> + <directory name="mlang"> + <xi:include href="mlang/mlang.rbuild" /> + </directory> + <directory name="msi"> + <xi:include href="msi/msi.rbuild" /> + </directory> + <directory name="msvcrt"> + <xi:include href="msvcrt/msvcrt.rbuild" /> + </directory> + <directory name="netapi32"> + <xi:include href="netapi32/netapi32.rbuild" /> + </directory> + <directory name="ntdll"> + <xi:include href="ntdll/ntdll.rbuild" /> + </directory> + <directory name="odbccp32"> + <xi:include href="odbccp32/odbccp32.rbuild" /> + </directory> +  + <directory name="psapi"> + <xi:include href="psapi/psapi.rbuild" /> + </directory> + <directory name="powrprof"> + <xi:include href="powrprof/powrprof.rbuild" /> + </directory> + <directory name="riched20"> + <xi:include href="riched20/riched20.rbuild" /> + </directory> + <directory name="rpcrt4"> + <xi:include href="rpcrt4/rpcrt4.rbuild" /> + </directory> + <directory name="rsabase"> + <xi:include href="rsabase/rsabase.rbuild" /> + </directory> + <directory name="rsaenh"> + <xi:include href="rsaenh/rsaenh.rbuild" /> + </directory> + <directory name="schannel"> + <xi:include href="schannel/schannel.rbuild" /> + </directory> + <directory name="setupapi"> + <xi:include href="setupapi/setupapi.rbuild" /> + </directory> + <directory name="shell32"> + <xi:include href="shell32/shell32.rbuild" /> + </directory> + <directory name="shlwapi"> + <xi:include href="shlwapi/shlwapi.rbuild" /> + </directory> + <directory name="urlmon"> + <xi:include href="urlmon/urlmon.rbuild" /> + </directory> + <directory name="user32"> + <xi:include href="user32/user32.rbuild" /> + </directory> + <directory name="usp10"> + <xi:include href="usp10/usp10.rbuild" /> + </directory> + <directory name="uxtheme"> + <xi:include href="uxtheme/uxtheme.rbuild" /> + </directory> + <directory name="version"> + <xi:include href="version/version.rbuild" /> + </directory> + <directory name="wininet"> + <xi:include href="wininet/wininet.rbuild" /> + </directory> </group>

1 0

[mpiulachs] 32449: Add support for multiple architectures to autorun.inf
by mpiulachs＠svn.reactos.org 22 Feb '08

22 Feb '08

Author: mpiulachs Date: Fri Feb 22 15:14:08 2008 New Revision: 32449 URL: http://svn.reactos.org/svn/reactos?rev=32449&view=rev Log: Add support for multiple architectures to autorun.inf Modified: branches/rbuild/reactos/boot/bootdata/autorun.inf Modified: branches/rbuild/reactos/boot/bootdata/autorun.inf URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/boot/bootdata/au… ============================================================================== --- branches/rbuild/reactos/boot/bootdata/autorun.inf (original) +++ branches/rbuild/reactos/boot/bootdata/autorun.inf Fri Feb 22 15:14:08 2008 @@ -1,4 +1,19 @@ [autorun] -open=reactos\welcome.exe +open=i386\welcome.exe icon=icon.ico + +[autorun.mips] + +open=mips\welcome.exe +icon=icon.ico + +[autorun.alpha] + +open=alpha\welcome.exe +icon=icon.ico + +[autorun.ppc] + +open=ppc\welcome.exe +icon=icon.ico

2 1

[spetreolle] 32455: Fix SmpSetEnvironmentVariable return status
by spetreolle＠svn.reactos.org 22 Feb '08

22 Feb '08

Author: spetreolle Date: Fri Feb 22 21:29:37 2008 New Revision: 32455 URL: http://svn.reactos.org/svn/reactos?rev=32455&view=rev Log: Fix SmpSetEnvironmentVariable return status Modified: trunk/reactos/base/system/smss/initenv.c Modified: trunk/reactos/base/system/smss/initenv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/initenv.c… ============================================================================== --- trunk/reactos/base/system/smss/initenv.c (original) +++ trunk/reactos/base/system/smss/initenv.c Fri Feb 22 21:29:37 2008 @@ -54,11 +54,9 @@ ValueName); RtlInitUnicodeString(&EnvValue, (PWSTR)ValueData); - RtlSetEnvironmentVariable(Context, + return RtlSetEnvironmentVariable(Context, &EnvVariable, &EnvValue); - - return STATUS_SUCCESS; }

1 0

[cfinck] 32454: Add some svn:ignore settings and a comment to the "Constants.pm" for making it easier to run the Bugzilla locally.
by cfinck＠svn.reactos.org 22 Feb '08

22 Feb '08

Author: cfinck Date: Fri Feb 22 18:19:43 2008 New Revision: 32454 URL: http://svn.reactos.org/svn/reactos?rev=32454&view=rev Log: Add some svn:ignore settings and a comment to the "Constants.pm" for making it easier to run the Bugzilla locally. Modified: trunk/web/reactos.org/htdocs/bugzilla/ (props changed) trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/ (props changed) trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Constants.pm trunk/web/reactos.org/htdocs/bugzilla/skins/ (props changed) trunk/web/reactos.org/htdocs/bugzilla/template/ (props changed) Propchange: trunk/web/reactos.org/htdocs/bugzilla/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Feb 22 18:19:43 2008 @@ -1,0 +1,5 @@ +data +extensions +graphs +.htaccess +localconfig Propchange: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Feb 22 18:19:43 2008 @@ -1,0 +1,1 @@ +.htaccess Modified: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Constants.pm URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/Bu… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Constants.pm (original) +++ trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Constants.pm Fri Feb 22 18:19:43 2008 @@ -412,6 +412,7 @@ $datadir = "data"; } + # Set this to "localconfig" if you want to run the Bugzilla locally $localconfig = "/web/reactos.org/config/bugzilla-config"; # We have to return absolute paths for mod_perl. Propchange: trunk/web/reactos.org/htdocs/bugzilla/skins/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Feb 22 18:19:43 2008 @@ -1,0 +1,2 @@ +contrib +custom Propchange: trunk/web/reactos.org/htdocs/bugzilla/template/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Feb 22 18:19:43 2008 @@ -1,0 +1,1 @@ +.htaccess

1 0

[cfinck] 32453: Update to Bugzilla 3.0.3
by cfinck＠svn.reactos.org 22 Feb '08

22 Feb '08

Author: cfinck Date: Fri Feb 22 18:16:17 2008 New Revision: 32453 URL: http://svn.reactos.org/svn/reactos?rev=32453&view=rev Log: Update to Bugzilla 3.0.3 Modified: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Bug.pm trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/BugMail.pm trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Constants.pm trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/DB.pm trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Hook.pm trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Install/Requirements.pm trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Mailer.pm trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Search.pm trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Search/Quicksearch.pm trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Template.pm trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/User.pm trunk/web/reactos.org/htdocs/bugzilla/QUICKSTART trunk/web/reactos.org/htdocs/bugzilla/UPGRADING-pre-2.8 trunk/web/reactos.org/htdocs/bugzilla/buglist.cgi trunk/web/reactos.org/htdocs/bugzilla/config.cgi trunk/web/reactos.org/htdocs/bugzilla/contrib/README trunk/web/reactos.org/htdocs/bugzilla/contrib/merge-users.pl trunk/web/reactos.org/htdocs/bugzilla/contrib/syncLDAP.pl trunk/web/reactos.org/htdocs/bugzilla/editusers.cgi trunk/web/reactos.org/htdocs/bugzilla/email_in.pl trunk/web/reactos.org/htdocs/bugzilla/mod_perl.pl trunk/web/reactos.org/htdocs/bugzilla/post_bug.cgi trunk/web/reactos.org/htdocs/bugzilla/query.cgi trunk/web/reactos.org/htdocs/bugzilla/template/en/default/admin/components/… trunk/web/reactos.org/htdocs/bugzilla/template/en/default/admin/groups/dele… trunk/web/reactos.org/htdocs/bugzilla/template/en/default/admin/params/auth… trunk/web/reactos.org/htdocs/bugzilla/template/en/default/admin/products/co… trunk/web/reactos.org/htdocs/bugzilla/template/en/default/admin/products/li… trunk/web/reactos.org/htdocs/bugzilla/template/en/default/admin/users/confi… trunk/web/reactos.org/htdocs/bugzilla/template/en/default/bug/dependency-tr… trunk/web/reactos.org/htdocs/bugzilla/template/en/default/config.js.tmpl trunk/web/reactos.org/htdocs/bugzilla/template/en/default/config.rdf.tmpl trunk/web/reactos.org/htdocs/bugzilla/template/en/default/global/user-error… trunk/web/reactos.org/htdocs/bugzilla/template/en/default/list/list.ics.tmpl trunk/web/reactos.org/htdocs/bugzilla/template/en/default/list/quips.html.t… trunk/web/reactos.org/htdocs/bugzilla/template/en/default/pages/quicksearch… trunk/web/reactos.org/htdocs/bugzilla/template/en/default/pages/release-not… Modified: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Bug.pm URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/Bu… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Bug.pm (original) +++ trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Bug.pm Fri Feb 22 18:16:17 2008 @@ -1391,7 +1391,7 @@ # Obsolete custom fields are not editable. my @obsolete_fields = Bugzilla->get_fields({obsolete => 1, custom => 1}); @obsolete_fields = map { $_->name } @obsolete_fields; - foreach my $remove ("bug_id", "creation_ts", "delta_ts", "lastdiffed", @obsolete_fields) { + foreach my $remove ("bug_id", "reporter", "creation_ts", "delta_ts", "lastdiffed", @obsolete_fields) { my $location = lsearch(\@fields, $remove); splice(@fields, $location, 1); } Modified: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/BugMail.pm URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/Bu… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/BugMail.pm (original) +++ trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/BugMail.pm Fri Feb 22 18:16:17 2008 @@ -110,7 +110,7 @@ } my %values = %{$dbh->selectrow_hashref( - 'SELECT ' . join(',', editable_bug_fields()) . ', + 'SELECT ' . join(',', editable_bug_fields()) . ', reporter, lastdiffed AS start, LOCALTIMESTAMP(0) AS end FROM bugs WHERE bug_id = ?', undef, $id)}; Modified: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Constants.pm URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/Bu… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Constants.pm (original) +++ trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Constants.pm Fri Feb 22 18:16:17 2008 @@ -146,7 +146,7 @@ # CONSTANTS # # Bugzilla version -use constant BUGZILLA_VERSION => "3.0.2"; +use constant BUGZILLA_VERSION => "3.0.3"; # # ControlMap constants for group_control_map. Modified: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/DB.pm URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/Bu… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/DB.pm (original) +++ trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/DB.pm Fri Feb 22 18:16:17 2008 @@ -898,7 +898,6 @@ } if (!defined($attributes)); # connect using our known info to the specified db - # Apache::DBI will cache this when using mod_perl my $self = DBI->connect($dsn, $user, $pass, $attributes) or die "\nCan't connect to the database.\nError: $DBI::errstr\n" . " Is your database installed and up and running?\n Do you have" Modified: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Hook.pm URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/Bu… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Hook.pm (original) +++ trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Hook.pm Fri Feb 22 18:16:17 2008 @@ -46,6 +46,8 @@ do($extension.'/code/'.$name.'.pl'); ThrowCodeError('extension_invalid', { errstr => $@, name => $name, extension => $extension }) if $@; + # Flush stored data. + Bugzilla->hook_args({}); } } Modified: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Install/Requirements.pm URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/Bu… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Install/Requirements.pm (original) +++ trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Install/Requirements.pm Fri Feb 22 18:16:17 2008 @@ -219,12 +219,6 @@ package => 'CGI', module => 'CGI', version => '3.11', - feature => 'mod_perl' - }, - { - package => 'Apache-DBI', - module => 'Apache::DBI', - version => '0.96', feature => 'mod_perl' }, ); @@ -585,7 +579,7 @@ $package = $module->{package}; } else { - $command = "$^X -MCPAN -e 'install \%s'"; + $command = "$^X -MCPAN -e 'install \"\%s\"'"; # Non-Windows installations need to use module names, because # CPAN doesn't understand package names. $package = $module->{module}; Modified: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Mailer.pm URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/Bu… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Mailer.pm (original) +++ trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Mailer.pm Fri Feb 22 18:16:17 2008 @@ -69,6 +69,8 @@ if (my $value = $email->header($header)) { $value = Encode::decode("UTF-8", $value) if Bugzilla->params->{'utf8'}; my $encoded = encode('MIME-Q', $value); + # Encode adds unnecessary line breaks, with two spaces after each. + $encoded =~ s/\n / /g; $email->header_set($header, $encoded); } } Modified: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Search.pm URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/Bu… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Search.pm (original) +++ trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Search.pm Fri Feb 22 18:16:17 2008 @@ -166,7 +166,7 @@ } if (grep($_ =~/AS (actual_time|percentage_complete)$/, @$fieldsref)) { - push(@supptables, "INNER JOIN longdescs AS ldtime " . + push(@supptables, "LEFT JOIN longdescs AS ldtime " . "ON ldtime.bug_id = bugs.bug_id"); } @@ -565,20 +565,20 @@ "^long_?desc,changedby" => sub { my $table = "longdescs_$chartid"; - push(@supptables, "INNER JOIN longdescs AS $table " . + push(@supptables, "LEFT JOIN longdescs AS $table " . "ON $table.bug_id = bugs.bug_id"); my $id = login_to_id($v, THROW_ERROR); $term = "$table.who = $id"; }, "^long_?desc,changedbefore" => sub { my $table = "longdescs_$chartid"; - push(@supptables, "INNER JOIN longdescs AS $table " . + push(@supptables, "LEFT JOIN longdescs AS $table " . "ON $table.bug_id = bugs.bug_id"); $term = "$table.bug_when < " . $dbh->quote(SqlifyDate($v)); }, "^long_?desc,changedafter" => sub { my $table = "longdescs_$chartid"; - push(@supptables, "INNER JOIN longdescs AS $table " . + push(@supptables, "LEFT JOIN longdescs AS $table " . "ON $table.bug_id = bugs.bug_id"); $term = "$table.bug_when > " . $dbh->quote(SqlifyDate($v)); }, @@ -598,7 +598,7 @@ { $extra = "AND $table.isprivate < 1"; } - push(@supptables, "INNER JOIN longdescs AS $table " . + push(@supptables, "LEFT JOIN longdescs AS $table " . "ON bugs.bug_id = $table.bug_id $extra"); # Create search terms to add to the SELECT and WHERE clauses. @@ -704,7 +704,7 @@ { $extra = "AND $table.isprivate < 1"; } - push(@supptables, "INNER JOIN longdescs AS $table " . + push(@supptables, "LEFT JOIN longdescs AS $table " . "ON $table.bug_id = bugs.bug_id $extra"); $f = "$table.thetext"; }, @@ -716,13 +716,13 @@ { $extra = "AND $table.isprivate < 1"; } - push(@supptables, "INNER JOIN longdescs AS $table " . + push(@supptables, "LEFT JOIN longdescs AS $table " . "ON $table.bug_id = bugs.bug_id $extra"); $f = "$table.isprivate"; }, "^work_time,changedby" => sub { my $table = "longdescs_$chartid"; - push(@supptables, "INNER JOIN longdescs AS $table " . + push(@supptables, "LEFT JOIN longdescs AS $table " . "ON $table.bug_id = bugs.bug_id"); my $id = login_to_id($v, THROW_ERROR); $term = "(($table.who = $id"; @@ -730,21 +730,21 @@ }, "^work_time,changedbefore" => sub { my $table = "longdescs_$chartid"; - push(@supptables, "INNER JOIN longdescs AS $table " . + push(@supptables, "LEFT JOIN longdescs AS $table " . "ON $table.bug_id = bugs.bug_id"); $term = "(($table.bug_when < " . $dbh->quote(SqlifyDate($v)); $term .= ") AND ($table.work_time <> 0))"; }, "^work_time,changedafter" => sub { my $table = "longdescs_$chartid"; - push(@supptables, "INNER JOIN longdescs AS $table " . + push(@supptables, "LEFT JOIN longdescs AS $table " . "ON $table.bug_id = bugs.bug_id"); $term = "(($table.bug_when > " . $dbh->quote(SqlifyDate($v)); $term .= ") AND ($table.work_time <> 0))"; }, "^work_time," => sub { my $table = "longdescs_$chartid"; - push(@supptables, "INNER JOIN longdescs AS $table " . + push(@supptables, "LEFT JOIN longdescs AS $table " . "ON $table.bug_id = bugs.bug_id"); $f = "$table.work_time"; }, @@ -776,7 +776,7 @@ if(lsearch(\@fields, "bugs.remaining_time") == -1) { push(@fields, "bugs.remaining_time"); } - push(@supptables, "INNER JOIN longdescs AS $table " . + push(@supptables, "LEFT JOIN longdescs AS $table " . "ON $table.bug_id = bugs.bug_id"); my $expression = "(100 * ((SUM($table.work_time) * COUNT(DISTINCT $table.bug_when) / @@ -1112,7 +1112,7 @@ ",anyexact" => sub { my @list; foreach my $w (split(/,/, $v)) { - if ($w eq "---" && $f !~ /milestone/) { + if ($w eq "---" && $f =~ /resolution/) { $w = ""; } $q = $dbh->quote($w); @@ -1427,21 +1427,20 @@ my $suppstring = "bugs"; my @supplist = (" "); foreach my $str (@supptables) { - if (!$suppseen{$str}) { - if ($str =~ /^(LEFT|INNER|RIGHT)\s+JOIN/i) { - $str =~ /^(.*?)\s+ON\s+(.*)$/i; - my ($leftside, $rightside) = ($1, $2); - if ($suppseen{$leftside}) { - $supplist[$suppseen{$leftside}] .= " AND ($rightside)"; - } else { - $suppseen{$leftside} = scalar @supplist; - push @supplist, " $leftside ON ($rightside)"; - } + + if ($str =~ /^(LEFT|INNER|RIGHT)\s+JOIN/i) { + $str =~ /^(.*?)\s+ON\s+(.*)$/i; + my ($leftside, $rightside) = ($1, $2); + if (defined $suppseen{$leftside}) { + $supplist[$suppseen{$leftside}] .= " AND ($rightside)"; } else { - # Do not accept implicit joins using comma operator - # as they are not DB agnostic - ThrowCodeError("comma_operator_deprecated"); + $suppseen{$leftside} = scalar @supplist; + push @supplist, " $leftside ON ($rightside)"; } + } else { + # Do not accept implicit joins using comma operator + # as they are not DB agnostic + ThrowCodeError("comma_operator_deprecated"); } } $suppstring .= join('', @supplist); Modified: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Search/Quicksearch.pm URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/Bu… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Search/Quicksearch.pm (original) +++ trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Search/Quicksearch.pm Fri Feb 22 18:16:17 2008 @@ -267,7 +267,7 @@ foreach my $or_operand (split(/\|/, $qsword)) { if ($or_operand =~ /^votes:([0-9]+)$/) { # votes:xx ("at least xx votes") - addChart('votes', 'greaterthan', $1, $negate); + addChart('votes', 'greaterthan', $1 - 1, $negate); } elsif ($or_operand =~ /^([^:]+):([^:]+)$/) { # generic field1,field2,field3:value1,value2 notation Modified: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Template.pm URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/Bu… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Template.pm (original) +++ trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Template.pm Fri Feb 22 18:16:17 2008 @@ -42,10 +42,12 @@ use MIME::Base64; use Bugzilla::Bug; +use Cwd qw(abs_path); # for time2str - replace by TT Date plugin?? use Date::Format (); +use File::Basename qw(dirname); use File::Find; -use File::Path; +use File::Path qw(rmtree mkpath); use File::Spec; use IO::Dir; @@ -898,6 +900,26 @@ } } + # Under mod_perl, we look for templates using the absolute path of the + # template directory, which causes Template Toolkit to look for their + # *compiled* versions using the full absolute path under the data/template + # directory. (Like data/template/var/www/html/mod_perl/.) To avoid + # re-compiling templates under mod_perl, we symlink to the + # already-compiled templates. This doesn't work on Windows. + if (!ON_WINDOWS) { + my $abs_root = dirname(abs_path($templatedir)); + my $todir = "$datadir/template$abs_root"; + mkpath($todir); + # We use abs2rel so that the symlink will look like + # "../../../../template" which works, while just + # "data/template/template/" doesn't work. + my $fromdir = File::Spec->abs2rel("$datadir/template/template", $todir); + # We eval for systems that can't symlink at all, where "symlink" + # throws a fatal error. + eval { symlink($fromdir, "$todir/template") + or warn "Failed to symlink from $fromdir to $todir: $!" }; + } + # If anything created a Template object before now, clear it out. delete Bugzilla->request_cache->{template}; } Modified: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/User.pm URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/Bu… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/User.pm (original) +++ trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/User.pm Fri Feb 22 18:16:17 2008 @@ -562,21 +562,16 @@ sub can_edit_product { my ($self, $prod_id) = @_; my $dbh = Bugzilla->dbh; - my $sth = $self->{sthCanEditProductId}; - my $userid = $self->{id}; - my $query = q{SELECT group_id FROM group_control_map - WHERE product_id =? - AND canedit != 0 }; - if (%{$self->groups}) { - my $groups = join(',', values(%{$self->groups})); - $query .= qq{AND group_id NOT IN($groups)}; - } - unless ($sth) { $sth = $dbh->prepare($query); } - $sth->execute($prod_id); - $self->{sthCanEditProductId} = $sth; - my $result = $sth->fetchrow_array(); - - return (!defined($result)); + + my $has_external_groups = + $dbh->selectrow_array('SELECT 1 + FROM group_control_map + WHERE product_id = ? + AND canedit != 0 + AND group_id NOT IN(' . $self->groups_as_string . ')', + undef, $prod_id); + + return !$has_external_groups; } sub can_see_bug { @@ -771,7 +766,7 @@ ($self->in_group('editcomponents', $product->id) && $self->can_see_product($product->name)) - || ThrowUserError('product_access_denied', {product => $product->name}); + || ThrowUserError('product_admin_denied', {product => $product->name}); # Return the validated product object. return $product; @@ -1375,8 +1370,8 @@ if ($fieldName eq "CC") { my $login = $self->login; - my $inold = ($old =~ /^(.*,)?\Q$login\E(,.*)?$/); - my $innew = ($new =~ /^(.*,)?\Q$login\E(,.*)?$/); + my $inold = ($old =~ /^(.*,\s*)?\Q$login\E(,.*)?$/); + my $innew = ($new =~ /^(.*,\s*)?\Q$login\E(,.*)?$/); if ($inold != $innew) { $events{+EVT_ADDED_REMOVED} = 1; Modified: trunk/web/reactos.org/htdocs/bugzilla/QUICKSTART URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/QU… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/QUICKSTART (original) +++ trunk/web/reactos.org/htdocs/bugzilla/QUICKSTART Fri Feb 22 18:16:17 2008 @@ -27,9 +27,6 @@ 4. Edit the localconfig file, in particular the $webservergroup and $db_* variables. In particular, $db_name and $db_user will define your database setup in step 5. - - If you want to change platforms, operating systems, severities and - priorities, this can also be done in localconfig at this time. 5. Using the name you provided as $db_name above, create a MySQL database for Bugzilla. You should also create a user permission for the name @@ -67,7 +64,7 @@ account information you provided in step 6. 9. Scroll to the bottom of the page after logging in, and select - "parameters". Set up the relevant parameters for your local setup. + "Parameters". Set up the relevant parameters for your local setup. See section 4.2 of the Bugzilla Guide for a in-depth description of some of the configuration parameters available. Modified: trunk/web/reactos.org/htdocs/bugzilla/UPGRADING-pre-2.8 URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/UP… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/UPGRADING-pre-2.8 (original) +++ trunk/web/reactos.org/htdocs/bugzilla/UPGRADING-pre-2.8 Fri Feb 22 18:16:17 2008 @@ -3,6 +3,11 @@ If you are upgrading from 2.8 or newer, please read the Installation and Upgrade instructions in The Bugzilla Guide, found with this distribution in docs/html, docs/txt, and docs/sgml. + +Please note that the period in our version numbers is a place separator, not +a decimal point. The 14 in version 2.14 is newer than the 8 in 2.8, for +example. You should only be using this file if you have a single digit +after the period in the version 2.x Bugzilla you are upgrading from. For a complete list of what changes, use Bonsai (http://cvs-mirror.mozilla.org/webtools/bonsai/cvsqueryform.cgi) to Modified: trunk/web/reactos.org/htdocs/bugzilla/buglist.cgi URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/bu… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/buglist.cgi (original) +++ trunk/web/reactos.org/htdocs/bugzilla/buglist.cgi Fri Feb 22 18:16:17 2008 @@ -932,7 +932,7 @@ # Now put $db_order into a format that Bugzilla::Search can use. # (We create $db_order as a string first because that's the way # we did it before Bugzilla::Search took an "order" argument.) -my @orderstrings = split(',', $db_order); +my @orderstrings = split(/,\s*/, $db_order); # Generate the basic SQL query that will be used to generate the bug list. my $search = new Bugzilla::Search('fields' => \@selectnames, Modified: trunk/web/reactos.org/htdocs/bugzilla/config.cgi URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/co… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/config.cgi (original) +++ trunk/web/reactos.org/htdocs/bugzilla/config.cgi Fri Feb 22 18:16:17 2008 @@ -55,6 +55,8 @@ $vars->{'keyword'} = [map($_->name, Bugzilla::Keyword->get_all)]; $vars->{'resolution'} = get_legal_field_values('resolution'); $vars->{'status'} = get_legal_field_values('bug_status'); +$vars->{'custom_fields'} = + [Bugzilla->get_fields({custom => 1, obsolete => 0, type => FIELD_TYPE_SINGLE_SELECT})]; # Include a list of product objects. if ($cgi->param('product')) { Modified: trunk/web/reactos.org/htdocs/bugzilla/contrib/README URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/co… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/contrib/README (original) +++ trunk/web/reactos.org/htdocs/bugzilla/contrib/README Fri Feb 22 18:16:17 2008 @@ -1,47 +1,73 @@ This directory contains contributed software related to Bugzilla. Things in here have not necessarily been tested or tried by anyone -except the original contributor, so tred carefully. But it may still -be useful to you. +except the original contributor, so tread carefully. But it may still +be useful to you. Read the files themselves for detailed usage information +on any specific script. This file is encoded in UTF8 for purposes of contributor names. This directory includes: +bugzilla_ldapsync.rb -- Script that can be run via Cron that queries an LDAP + server for e-mail addresses to add Bugzilla users + for. Will optionally disable Bugzilla users with + no matching LDAP record. Contributed by Thomas + Stromberg <thomas+bugzilla(a)stromberg.org>. + bugzilla-submit/ -- A standalone bug submission program. - mysqld-watcher.pl -- This script can be installed as a frequent cron - job to clean up stalled/dead queries. + bzdbcopy.pl -- A script to copy data from an installation running + on one DB platform to an installation running on + another DB platform. - sendbugmail.pl -- This script is a drop-in replacement for the - 'processmail' script which used to be shipped - with Bugzilla, but was replaced by the - Bugzilla/BugMail.pm Perl module. You can use - this script if you were previously calling - processmail from other scripts external to - Bugzilla. See the comments at the top of - the file for usage information. Contributed - by Nick Barnes of Ravenbrook Limited. +bz_webservice_demo.p -- An example script that demonstrates how to talk to + Bugzilla via XMLRPC. + + cmdline/ -- Various commands for querying your Bugzilla + installation. + + cvs-update.pl -- Script to keep a record of all CVS updates made + from a given directory. The log is useful when + changes need to be backed out. gnatsparse/ -- A Python script used to import a GNATS database into Bugzilla. - gnats2bz.pl -- A perl script to help import bugs from a GNATS + gnats2bz.pl -- A Perl script to help import bugs from a GNATS database into a Bugzilla database. Contributed by - Tom Schutter <tom(a)platte.com> - - yp_nomail.sh -- Script you can run via cron that regularly updates - the nomail file for terminated employees + Tom Schutter <tom(a)platte.com>. -bugzilla_ldapsync.rb -- Script you can run via cron that queries an LDAP - server for e-mail addresses to add Bugzilla users - for. Will optionally disable Bugzilla users with - no matching LDAP record. Contributed by Thomas - Stromberg <thomas+bugzilla(a)stromberg.org> + jb2bz.py -- Script to import bugs from JitterBug to Bugzilla. - syncLDAP.pl -- Script you can run via cron that queries an LDAP + merge-users.pl -- Script to merge two user accounts. The activities + from one account are moved to the another. Specify + both accounts on the command line. The new account + must already exist. + + mysqld-watcher.pl -- This script can be installed as a frequent Cron + job to clean up stalled/dead queries. + + recode.pl -- Script to convert a database from one encoding + (or multiple encodings) to UTF-8. + + sendbugmail.pl -- This script is a drop-in replacement for the + 'processmail' script which used to be shipped + with Bugzilla, but was replaced by the + Bugzilla/BugMail.pm Perl module. This script can + be used if 'processmail' was previously called + from other scripts external to + Bugzilla. See the comments at the top of + the file for usage information. Contributed + by Nick Barnes of Ravenbrook Limited. + +sendunsentbugmail.pl -- Script to find bugs with un-sent mail and to + send all unsent messages. + + syncLDAP.pl -- Script that can be run via Cron that queries an LDAP server for users and e-mail addresses and adds missing users to Bugzilla. Can disable/update non-existing/changed information. Contributed by - Andreas HÃ¶fler <andreas.hoefler(a)bearingpoint.com> + Andreas HÃ¶fler <andreas.hoefler(a)bearingpoint.com>. - + yp_nomail.sh -- Script that can be run via Cron that regularly updates + the nomail file for terminated employees. Modified: trunk/web/reactos.org/htdocs/bugzilla/contrib/merge-users.pl URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/co… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/contrib/merge-users.pl (original) +++ trunk/web/reactos.org/htdocs/bugzilla/contrib/merge-users.pl Fri Feb 22 18:16:17 2008 @@ -131,12 +131,14 @@ votes => ['who'], # Tables affecting global behavior / other users. components => ['initialowner', 'initialqacontact'], + component_cc => ['user_id component_id'], quips => ['userid'], series => ['creator'], whine_events => ['owner_userid'], watch => ['watcher watched', 'watched watcher'], # Tables affecting the user directly. namedqueries => ['userid name'], + namedqueries_link_in_footer => ['user_id namedquery_id'], user_group_map => ['user_id group_id isbless grant_type'], email_setting => ['user_id relationship event'], profile_setting => ['user_id setting_name'], Modified: trunk/web/reactos.org/htdocs/bugzilla/contrib/syncLDAP.pl URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/co… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/contrib/syncLDAP.pl (original) +++ trunk/web/reactos.org/htdocs/bugzilla/contrib/syncLDAP.pl Fri Feb 22 18:16:17 2008 @@ -276,7 +276,7 @@ Bugzilla::User->create({ login_name => $key, realname => @$value{'realname'}, - password => '*'}); + cryptpassword => '*'}); } print "done!\n" unless $quiet; } Modified: trunk/web/reactos.org/htdocs/bugzilla/editusers.cgi URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/ed… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/editusers.cgi (original) +++ trunk/web/reactos.org/htdocs/bugzilla/editusers.cgi Fri Feb 22 18:16:17 2008 @@ -585,9 +585,6 @@ } # 2) Whines - my $sth_whineidFromSchedules = $dbh->prepare( - qq{SELECT eventid FROM whine_schedules - WHERE mailto = ? AND mailto_type = ?}); my $sth_whineidFromEvents = $dbh->prepare( 'SELECT id FROM whine_events WHERE owner_userid = ?'); my $sth_deleteWhineEvent = $dbh->prepare( @@ -597,12 +594,8 @@ my $sth_deleteWhineSchedule = $dbh->prepare( 'DELETE FROM whine_schedules WHERE eventid = ?'); - $sth_whineidFromSchedules->execute($otherUserID, MAILTO_USER); - while ($id = $sth_whineidFromSchedules->fetchrow_array()) { - $sth_deleteWhineQuery->execute($id); - $sth_deleteWhineSchedule->execute($id); - $sth_deleteWhineEvent->execute($id); - } + $dbh->do('DELETE FROM whine_schedules WHERE mailto = ? AND mailto_type = ?', + undef, ($otherUserID, MAILTO_USER)); $sth_whineidFromEvents->execute($otherUserID); while ($id = $sth_whineidFromEvents->fetchrow_array()) { Modified: trunk/web/reactos.org/htdocs/bugzilla/email_in.pl URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/em… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/email_in.pl (original) +++ trunk/web/reactos.org/htdocs/bugzilla/email_in.pl Fri Feb 22 18:16:17 2008 @@ -36,6 +36,7 @@ use Email::MIME::Attachment::Stripper; use Getopt::Long qw(:config bundling); use Pod::Usage; +use Encode qw(encode decode); use Bugzilla; use Bugzilla::Bug qw(ValidateBugID); @@ -295,9 +296,17 @@ my $body; foreach my $part (@parts) { my $ct = $part->content_type || 'text/plain'; + my $charset = 'iso-8859-1'; + if ($ct =~ /charset=([^;]+)/) { + $charset= $1; + } debug_print("Part Content-Type: $ct", 2); + debug_print("Part Character Encoding: $charset", 2); if (!$ct || $ct =~ /^text\/plain/i) { $body = $part->body; + if (Bugzilla->params->{'utf8'}) { + $body = encode('UTF-8', decode($charset, $body)); + } last; } } @@ -433,9 +442,24 @@ be included in the bug description. The C<@> labels can be any valid field name in Bugzilla that can be -set on C<enter_bug.cgi>. For the list of field names, see the -C<fielddefs> table in the database. The above example shows the -minimum fields you B<must> specify. +set on C<enter_bug.cgi>. For the list of required field names, see +L<Bugzilla::WebService::Bug/Create>. Note, that there is some difference +in the names of the required input fields between web and email interfaces, +as listed below: + +=over + +=item * + +C<platform> in web is C<@rep_platform> in email + +=item * + +C<severity> in web is C<@bug_severity> in email + +=back + +For the list of all field names, see the C<fielddefs> table in the database. The values for the fields can be split across multiple lines, but note that a newline will be parsed as a single space, for the value. Modified: trunk/web/reactos.org/htdocs/bugzilla/mod_perl.pl URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/mo… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/mod_perl.pl (original) +++ trunk/web/reactos.org/htdocs/bugzilla/mod_perl.pl Fri Feb 22 18:16:17 2008 @@ -28,7 +28,6 @@ # startup, so we always specify () after using any module in this # file. -use Apache::DBI (); use Apache2::ServerUtil; use Apache2::SizeLimit; use ModPerl::RegistryLoader (); @@ -71,6 +70,9 @@ # Have ModPerl::RegistryLoader pre-compile all CGI scripts. my $rl = new ModPerl::RegistryLoader(); +# If we try to do this in "new" it fails because it looks for a +# Bugzilla/ModPerl/ResponseHandler.pm +$rl->{package} = 'Bugzilla::ModPerl::ResponseHandler'; # Note that $cgi_path will be wrong if somebody puts the libraries # in a different place than the CGIs. foreach my $file (glob "$cgi_path/*.cgi") { Modified: trunk/web/reactos.org/htdocs/bugzilla/post_bug.cgi URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/po… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/post_bug.cgi (original) +++ trunk/web/reactos.org/htdocs/bugzilla/post_bug.cgi Fri Feb 22 18:16:17 2008 @@ -127,10 +127,6 @@ # value (e.g. "---" for custom single select fields). my @bug_fields = grep { defined $cgi->param($_->name) } @custom_bug_fields; @bug_fields = map { $_->name } @bug_fields; - -# Custom tables must be locked (required when validating custom fields). -my @custom_tables = grep { $_->type == FIELD_TYPE_SINGLE_SELECT } @custom_bug_fields; -@custom_tables = map { $_->name . ' READ' } @custom_tables; push(@bug_fields, qw( product Modified: trunk/web/reactos.org/htdocs/bugzilla/query.cgi URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/qu… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/query.cgi (original) +++ trunk/web/reactos.org/htdocs/bugzilla/query.cgi Fri Feb 22 18:16:17 2008 @@ -111,6 +111,7 @@ # and ignore any multiple values. sub PrefillForm { my ($buf) = (@_); + my $cgi = Bugzilla->cgi; $buf = new Bugzilla::CGI($buf); my $foundone = 0; @@ -136,17 +137,22 @@ $default{$name} = []; } + # we won't prefill the boolean chart data from this query if + # there are any being submitted via params + my $prefillcharts = (grep(/^field-/, $cgi->param)) ? 0 : 1; # Iterate over the URL parameters foreach my $name ($buf->param()) { my @values = $buf->param($name); - # If the name begins with field, type, or value, then it is part of - # the boolean charts. Because these are built different than the rest - # of the form, we don't need to save a default value. We do, however, - # need to indicate that we found something so the default query isn't - # added in if all we have are boolean chart items. - if ($name =~ m/^(?:field|type|value)/) { + # If the name begins with the string 'field', 'type', 'value', or + # 'negate', then it is part of the boolean charts. Because + # these are built different than the rest of the form, we need + # to store these as parameters. We also need to indicate that + # we found something so the default query isn't added in if + # all we have are boolean chart items. + if ($name =~ m/^(?:field|type|value|negate)/) { + $cgi->param(-name => $name, -value => $values[0]) if ($prefillcharts); $foundone = 1; } # If the name ends in a number (which it does for the fields which Modified: trunk/web/reactos.org/htdocs/bugzilla/template/en/default/admin/components/… URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/te… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/template/en/default/admin/components/… (original) +++ trunk/web/reactos.org/htdocs/bugzilla/template/en/default/admin/components/… Fri Feb 22 18:16:17 2008 @@ -74,7 +74,7 @@ <tr> <td valign="top">Product Milestone URL:</td> <td valign="top"> - <a href="[% product.milestone_url FILTER uri %]"> + <a href="[% product.milestone_url FILTER html %]"> [% product.milestone_url FILTER html %] </a> </td> Modified: trunk/web/reactos.org/htdocs/bugzilla/template/en/default/admin/groups/dele… URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/te… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/template/en/default/admin/groups/dele… (original) +++ trunk/web/reactos.org/htdocs/bugzilla/template/en/default/admin/groups/dele… Fri Feb 22 18:16:17 2008 @@ -120,10 +120,12 @@ indicated problems first before you can proceed.</b></p> [% END %] - <p><input type="submit" id="delete" value="Yes, delete"> - <input type="hidden" name="action" value="delete"> - <input type="hidden" name="group" value="[% gid FILTER html %]"> - <input type="hidden" name="token" value="[% token FILTER html %]"> + <p> + <input type="submit" id="delete" value="Yes, delete"> + <input type="hidden" name="action" value="delete"> + <input type="hidden" name="group" value="[% gid FILTER html %]"> + <input type="hidden" name="token" value="[% token FILTER html %]"> + </p> </form> Go back to the <a href="editgroups.cgi">group list</a>. Modified: trunk/web/reactos.org/htdocs/bugzilla/template/en/default/admin/params/auth… URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/te… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/template/en/default/admin/params/auth… (original) +++ trunk/web/reactos.org/htdocs/bugzilla/template/en/default/admin/params/auth… Fri Feb 22 18:16:17 2008 @@ -69,10 +69,10 @@ </dd> <dt>LDAP</dt> <dd> - LDAP authentication using an LDAP server. This method is - experimental; please see the $terms.Bugzilla documentation for more - information. Using this method requires additional parameters - to be set above. + LDAP authentication using an LDAP server. + Please see the $terms.Bugzilla documentation + for more information. Using this method requires + additional parameters to be set above. </dd> </dl>", @@ -121,4 +121,4 @@ "to be created. If this parameter is left blank, no users " _ "will be permitted to create their own accounts and all accounts " _ "will have to be created by an administrator." } -%] +%] Modified: trunk/web/reactos.org/htdocs/bugzilla/template/en/default/admin/products/co… URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/te… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/template/en/default/admin/products/co… (original) +++ trunk/web/reactos.org/htdocs/bugzilla/template/en/default/admin/products/co… Fri Feb 22 18:16:17 2008 @@ -90,7 +90,7 @@ <td>Milestone URL:</td> <td> [% IF product.milestone_url %] - <a href="[% product.milestone_url FILTER uri %]"> + <a href="[% product.milestone_url FILTER html %]"> [%- product.milestone_url FILTER html %] </a> [% ELSE %] Modified: trunk/web/reactos.org/htdocs/bugzilla/template/en/default/admin/products/li… URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/te… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/template/en/default/admin/products/li… (original) +++ trunk/web/reactos.org/htdocs/bugzilla/template/en/default/admin/products/li… Fri Feb 22 18:16:17 2008 @@ -50,14 +50,17 @@ name => "product_count" align => "right" heading => "Product Count" - }, - { + } + ] +%] + +[% IF user.in_group('editcomponents') %] + [% columns.push({ heading => "Action..." content => "Add product" - contentlink => add_contentlink - }, - ] -%] + contentlink => add_contentlink }) + %] +[% END %] [% PROCESS admin/table.html.tmpl columns = columns Modified: trunk/web/reactos.org/htdocs/bugzilla/template/en/default/admin/users/confi… URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/te… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/template/en/default/admin/users/confi… (original) +++ trunk/web/reactos.org/htdocs/bugzilla/template/en/default/admin/users/confi… Fri Feb 22 18:16:17 2008 @@ -401,32 +401,32 @@ will cease along with the deletion of the user account. </li> [% END %] - [% IF whine_events || whine_schedules %] - <li> - [% otheruser.login FILTER html %] - [% IF whine_events %] - has scheduled - [% IF whine_events == 1 %] - a whine - [% ELSE %] - [%+ whine_events %] whines - [% END %] - [% END %] - [% IF whine_schedules %] - [%+ 'and' IF whine_events %] - is on the receiving end of - [% IF whine_schedules == 1 %] - a whine - [% ELSE %] - [%+ whine_schedules %] whines - [% END %] - [% END %]. - [% IF whine_events + whine_schedules == 1 %] + [% IF whine_events %] + <li> + [% otheruser.login FILTER html %] has scheduled + [% IF whine_events == 1 %] + a whine + [% ELSE %] + [%+ whine_events %] whines + [% END %]. + [% IF whine_events == 1 %] This whine [% ELSE %] These whines [% END %] will be deleted along with the user account. + </li> + [% END %] + [% IF whine_schedules %] + <li> + [% otheruser.login FILTER html %] is on the receiving end of + [% IF whine_schedules == 1 %] + a whine + [% ELSE %] + [%+ whine_schedules %] whines + [% END %]. + The corresponding schedules will be deleted along with the user account, + but the whines themselves will be left unaltered. </li> [% END %] </ul> Modified: trunk/web/reactos.org/htdocs/bugzilla/template/en/default/bug/dependency-tr… URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/te… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/template/en/default/bug/dependency-tr… (original) +++ trunk/web/reactos.org/htdocs/bugzilla/template/en/default/bug/dependency-tr… Fri Feb 22 18:16:17 2008 @@ -144,10 +144,10 @@ <span class="summ_text">[%+ bug.short_desc FILTER html %]</span> <span class="summ_info">[[% INCLUDE buginfo %]]</span> </a> - <a href="showdependencytree.cgi?id=[% bugid FILTER uri %]" + <a href="showdependencytree.cgi?id=[% bugid FILTER url_quote %]" class="tree_link"> <img src="skins/standard/dependency-tree/tree.png" - title="See dependency tree for [% terms.bug %] [%+ bugid FILTER uri %]"> + title="See dependency tree for [% terms.bug %] [%+ bugid FILTER html %]"> </a> [% END %] [% END %] Modified: trunk/web/reactos.org/htdocs/bugzilla/template/en/default/config.js.tmpl URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/te… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/template/en/default/config.js.tmpl (original) +++ trunk/web/reactos.org/htdocs/bugzilla/template/en/default/config.js.tmpl Fri Feb 22 18:16:17 2008 @@ -56,6 +56,14 @@ // ========== var severity = [ [% FOREACH x = severity %]'[% x FILTER js %]', [% END %] ]; + + +// Custom Fields +// ============= + +[% FOREACH cf = custom_fields %] +var [% cf.name FILTER js %] = [ [% FOREACH x = cf.legal_values %]'[% x FILTER js %]', [% END %] ]; +[% END %] // Products and Components Modified: trunk/web/reactos.org/htdocs/bugzilla/template/en/default/config.rdf.tmpl URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/te… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/template/en/default/config.rdf.tmpl (original) +++ trunk/web/reactos.org/htdocs/bugzilla/template/en/default/config.rdf.tmpl Fri Feb 22 18:16:17 2008 @@ -103,17 +103,28 @@ </Seq> </bz:severity> +[% FOREACH cf = custom_fields %] + <bz:[% cf.name FILTER html %]> + <Seq> + [% FOREACH item = cf.legal_values %] + <li>[% item FILTER html %]</li> + [% END %] + </Seq> + </bz:[% cf.name FILTER html %]> + +[% END %] + <bz:products> <Seq> [% FOREACH product = products %] <li> - <bz:product rdf:about="[% Param('urlbase') %]product.cgi?name=[% product.name FILTER uri %]"> + <bz:product rdf:about="[% Param('urlbase') %]product.cgi?name=[% product.name FILTER url_quote %]"> <bz:name>[% product.name FILTER html %]</bz:name> <bz:components> <Seq> [% FOREACH component = product.components %] - <li resource="[% Param('urlbase') %]component.cgi?name=[% component.name FILTER uri %]"/> + <li resource="[% Param('urlbase') %]component.cgi?name=[% component.name FILTER url_quote %]"/> [% END %] </Seq> </bz:components> @@ -121,7 +132,7 @@ <bz:versions> <Seq> [% FOREACH version = product.versions %] - <li resource="[% Param('urlbase') %]version.cgi?name=[% version.name FILTER uri %]"/> + <li resource="[% Param('urlbase') %]version.cgi?name=[% version.name FILTER url_quote %]"/> [% END %] </Seq> </bz:versions> @@ -130,7 +141,7 @@ <bz:target_milestones> <Seq> [% FOREACH milestone = product.milestones %] - <li resource="[% Param('urlbase') %]milestone.cgi?name=[% milestone.name FILTER uri %]"/> + <li resource="[% Param('urlbase') %]milestone.cgi?name=[% milestone.name FILTER url_quote %]"/> [% END %] </Seq> </bz:target_milestones> @@ -147,7 +158,7 @@ [% FOREACH product = products %] [% FOREACH component = product.components %] <li> - <bz:component rdf:about="[% Param('urlbase') %]component.cgi?name=[% component.name FILTER uri %]"> + <bz:component rdf:about="[% Param('urlbase') %]component.cgi?name=[% component.name FILTER url_quote %]"> <bz:name>[% component.name FILTER html %]</bz:name> </bz:component> </li> @@ -161,7 +172,7 @@ [% FOREACH product = products %] [% FOREACH version = product.versions %] <li> - <bz:version rdf:about="[% Param('urlbase') %]version.cgi?name=[% version.name FILTER uri %]"> + <bz:version rdf:about="[% Param('urlbase') %]version.cgi?name=[% version.name FILTER url_quote %]"> <bz:name>[% version.name FILTER html %]</bz:name> </bz:version> </li> @@ -176,7 +187,7 @@ [% FOREACH product = products %] [% FOREACH milestone = product.milestones %] <li> - <bz:target_milestone rdf:about="[% Param('urlbase') %]milestone.cgi?name=[% milestone.name FILTER uri %]"> + <bz:target_milestone rdf:about="[% Param('urlbase') %]milestone.cgi?name=[% milestone.name FILTER url_quote %]"> <bz:name>[% milestone.name FILTER html %]</bz:name> </bz:target_milestone> </li> @@ -191,7 +202,7 @@ [% PROCESS "global/field-descs.none.tmpl" %] [% FOREACH item = field %] <li> - <bz:field rdf:about="[% Param('urlbase') %]field.cgi?name=[% item.name FILTER uri %]"> + <bz:field rdf:about="[% Param('urlbase') %]field.cgi?name=[% item.name FILTER url_quote %]"> <bz:name>[% item.name FILTER html %]</bz:name> <bz:description>[% (field_descs.${item.name} OR item.description) FILTER html %]</bz:description> </bz:field> Modified: trunk/web/reactos.org/htdocs/bugzilla/template/en/default/global/user-error… URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/te… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/template/en/default/global/user-error… (original) +++ trunk/web/reactos.org/htdocs/bugzilla/template/en/default/global/user-error… Fri Feb 22 18:16:17 2008 @@ -1201,7 +1201,7 @@ create the milestone '[% defaultmilestone FILTER html %]'</a> before it can be made the default milestone for product '[% product FILTER html %]'. - [% ELSIF error == "product_access_denied" %] + [% ELSIF error == "product_admin_denied" %] [% title = "Product Access Denied" %] You are not allowed to edit properties of product '[% product FILTER html %]'. Modified: trunk/web/reactos.org/htdocs/bugzilla/template/en/default/list/list.ics.tmpl URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/te… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/template/en/default/list/list.ics.tmpl (original) +++ trunk/web/reactos.org/htdocs/bugzilla/template/en/default/list/list.ics.tmpl Fri Feb 22 18:16:17 2008 @@ -58,11 +58,11 @@ [% END %] [% BLOCK ics_uid %] - [% "${bug_id}@${base_url}" FILTER uri FILTER ics('UID') %] + [% "${bug_id}@${base_url}" FILTER url_quote FILTER ics('UID') %] [% END %] [% BLOCK ics_url %] - [% "${base_url}show_bug.cgi?id=${bug_id}" FILTER uri FILTER ics('URL;VALUE=URI') %] + [% "${base_url}show_bug.cgi?id=${bug_id}" FILTER url_quote FILTER ics('URL;VALUE=URI') %] [% END %] [% BLOCK ics_dtstart %] Modified: trunk/web/reactos.org/htdocs/bugzilla/template/en/default/list/quips.html.t… URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/te… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/template/en/default/list/quips.html.t… (original) +++ trunk/web/reactos.org/htdocs/bugzilla/template/en/default/list/quips.html.t… Fri Feb 22 18:16:17 2008 @@ -120,13 +120,13 @@ [% "Unknown" IF NOT users.$userid %] </td> <td> - <a href="quips.cgi?action=delete&quipid=[% quipid FILTER uri%]"> + <a href="quips.cgi?action=delete&quipid=[% quipid FILTER url_quote %]"> Delete </a> </td> <td> - <input type="checkbox" name="quipid_[% quipid FILTER uri%]" - id="quipid_[% quipid FILTER uri%]" + <input type="checkbox" name="quipid_[% quipid FILTER html %]" + id="quipid_[% quipid FILTER html %]" [%- ' checked="checked"' IF quips.$quipid.approved %]> </td> </tr> Modified: trunk/web/reactos.org/htdocs/bugzilla/template/en/default/pages/quicksearch… URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/te… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/template/en/default/pages/quicksearch… (original) +++ trunk/web/reactos.org/htdocs/bugzilla/template/en/default/pages/quicksearch… Fri Feb 22 18:16:17 2008 @@ -264,7 +264,17 @@ <td><tt>attachmimetype</tt></td> <td>Attachment mime-type <i>(“attachments.mimetype”)</i></td> </tr> - +<tr> + <td> </td> + <td> </td> + <td><tt>votes</tt></td> + <td> </td> + <td> + Number of votes<br> + (votes:<i>N</i> and votes>=<i>N</i> mean "at least N votes", + votes><i>N</i> means "more than N votes") + </td> +</tr> </table> <p> @@ -301,19 +311,6 @@ <td><b>:</b><i>area</i></td> <td><b>product,component:</b><i>area</i></td> </tr> - <tr> <td><i>sev</i></td> <td><b>severity:</b><i>sev</i></td> @@ -342,30 +339,10 @@ <td><b>@</b><i>assignee</i></td> <td><b>assignedto:</b><i>assignee</i></td> </tr> - <tr> <td><b>!</b><i>keyword</i></td> <td><b>keywords:</b><i>keyword</i></td> </tr> - </table> <p> Modified: trunk/web/reactos.org/htdocs/bugzilla/template/en/default/pages/release-not… URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/te… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/template/en/default/pages/release-not… (original) +++ trunk/web/reactos.org/htdocs/bugzilla/template/en/default/pages/release-not… Fri Feb 22 18:16:17 2008 @@ -20,7 +20,7 @@ [% PROCESS global/variables.none.tmpl %] [% INCLUDE global/header.html.tmpl - title = "$terms.Bugzilla 3.0.2 Release Notes" + title = "$terms.Bugzilla 3.0.3 Release Notes" style_urls = ['skins/standard/release-notes.css'] %] @@ -60,6 +60,42 @@ most important fixes in each release. If you want a detailed list of <em>everything</em> that's changed in each version, you should use our <a href="http://www.bugzilla.org/status/changes.html">Change Log Page</a>.</p> + +<h3>3.0.3</h3> + +<ul> + <li>mod_perl no longer compiles [% terms.Bugzilla %]'s code for each Apache + process individually. It now compiles code only once and shares it among + each Apache process. This greatly improves performance and highly + decreases the memory footprint. + (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=398241">[% terms.Bug %] 398241</a>)</li> + + <li>You can now search for '---' (without quotes) in versions and milestones. + (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=362436">[% terms.Bug %] 362436</a>)</li> + + <li>[% terms.Bugzilla %] should no longer break lines unnecessarily in + email subjects. This was causing trouble with some email clients. + (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=374424">[% terms.Bug %] 374424</a>)</li> + + <li>If you had selected "I'm added to or removed from this capacity" option + for the "CC" role in your email preferences, you wouldn't get mail when + more than one person was added to the CC list at once. + (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=394796">[% terms.Bug %] 394796</a>)</li> + + <li>Deleting a user account no longer deletes whines from another user who + has the deleted account as addressee. The schedule is simply removed, + but the whine itself is left intact. + (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=395924">[% terms.Bug %] 395924</a>)</li> + + <li><kbd>contrib/merge-users.pl</kbd> now correctly merges all required + fields when merging two user accounts. + (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=400160">[% terms.Bug %] 400160</a>)</li> + + <li>[% terms.Bugzilla %] no longer requires Apache::DBI to run under + mod_perl. It caused troubles such as lost connections with the DB and + didn't give any important performance gain. + (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=408766">[% terms.Bug %] 408766</a>)</li> +</ul> <h3>3.0.2</h3> @@ -576,6 +612,10 @@ <h2><a name="v30_security"></a>Security Updates in This Release</h2> +<h3>3.0.3</h3> + +<p>No security fixes in this release.</p> + <h3>3.0.2</h3> <p>[% terms.Bugzilla %] 3.0.1 had an important security fix that is

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs