Ros-diffs October 2006

ros-diffs@reactos.org

17 participants
357 discussions

[hpoussin] 24503: Disable DbgBreakPoint() in release versions. This lets "copy nul com1:" fail instead of crashing. Next task: fix cmd.exe to let the command succeed
by hpoussin＠svn.reactos.org 13 Oct '06

13 Oct '06

Author: hpoussin Date: Fri Oct 13 18:31:57 2006 New Revision: 24503 URL: http://svn.reactos.org/svn/reactos?rev=24503&view=rev Log: Disable DbgBreakPoint() in release versions. This lets "copy nul com1:" fail instead of crashing. Next task: fix cmd.exe to let the command succeed Modified: trunk/reactos/drivers/bus/serenum/serenum.c Modified: trunk/reactos/drivers/bus/serenum/serenum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/serenum/serenu… ============================================================================== --- trunk/reactos/drivers/bus/serenum/serenum.c (original) +++ trunk/reactos/drivers/bus/serenum/serenum.c Fri Oct 13 18:31:57 2006 @@ -7,7 +7,7 @@ * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.com) */ -//#define NDEBUG +#define NDEBUG #define INITGUID #include "serenum.h" @@ -51,9 +51,7 @@ { DPRINT1("Serenum: FDO stub for major function 0x%lx\n", IoGetCurrentIrpStackLocation(Irp)->MajorFunction); -#ifndef NDEBUG - DbgBreakPoint(); -#endif + ASSERT(FALSE); Status = Irp->IoStatus.Status; } } @@ -74,9 +72,7 @@ { DPRINT1("Serenum: PDO stub for major function 0x%lx\n", IoGetCurrentIrpStackLocation(Irp)->MajorFunction); -#ifndef NDEBUG - DbgBreakPoint(); -#endif + ASSERT(FALSE); Status = Irp->IoStatus.Status; } }

1 0

[weiden] 24502: Fix building with GCC4
by weiden＠svn.reactos.org 13 Oct '06

13 Oct '06

Author: weiden Date: Fri Oct 13 16:52:24 2006 New Revision: 24502 URL: http://svn.reactos.org/svn/reactos?rev=24502&view=rev Log: Fix building with GCC4 Modified: trunk/reactos/base/applications/utils/binpatch/patch.c trunk/reactos/base/applications/utils/partinfo/partinfo.rbuild Modified: trunk/reactos/base/applications/utils/binpatch/patch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/utils/bi… ============================================================================== --- trunk/reactos/base/applications/utils/binpatch/patch.c (original) +++ trunk/reactos/base/applications/utils/binpatch/patch.c Fri Oct 13 16:52:24 2006 @@ -46,7 +46,7 @@ static char **m_argv = NULL; /* patch buffer where we put the patch info into */ -static unsigned char m_patchBuffer[SIZEOF_PATCH_BUFFER_MAGIC + PATCH_BUFFER_SIZE] = +static char m_patchBuffer[SIZEOF_PATCH_BUFFER_MAGIC + PATCH_BUFFER_SIZE] = PATCH_BUFFER_MAGIC; /** HELPER FUNCTIONS **********************************************************/ @@ -211,7 +211,7 @@ static int outputPatch(const char *outputFileName) { - unsigned char *patchExe, *patchBuffer = NULL; + char *patchExe, *patchBuffer = NULL; int i, size, patchExeSize, patchSize, stringSize, stringOffset, patchOffset; Patch *patch; PatchedFile *files; Modified: trunk/reactos/base/applications/utils/partinfo/partinfo.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/utils/pa… ============================================================================== --- trunk/reactos/base/applications/utils/partinfo/partinfo.rbuild (original) +++ trunk/reactos/base/applications/utils/partinfo/partinfo.rbuild Fri Oct 13 16:52:24 2006 @@ -1,4 +1,4 @@ -<module name="partinfo" type="win32cui" installbase="bin" installname="partinfo.exe"> +<module name="partinfo" type="win32cui" installbase="bin" installname="partinfo.exe" allowwarnings="true"> <define name="__USE_W32API" /> <library>msvcrt</library> <library>kernel32</library>

1 0

[janderwald] 24501: - add cat, load, unload, infinst, nts2w32err, objdir, partinfo to build system - fix includes in those modules
by janderwald＠svn.reactos.org 13 Oct '06

13 Oct '06

Author: janderwald Date: Fri Oct 13 14:56:52 2006 New Revision: 24501 URL: http://svn.reactos.org/svn/reactos?rev=24501&view=rev Log: - add cat, load, unload, infinst, nts2w32err, objdir, partinfo to build system - fix includes in those modules Added: trunk/reactos/base/applications/utils/cat/cat.rbuild (with props) trunk/reactos/base/applications/utils/driver/driver.rbuild (with props) trunk/reactos/base/applications/utils/driver/load/load.rbuild (with props) trunk/reactos/base/applications/utils/driver/unload/unload.rbuild (with props) trunk/reactos/base/applications/utils/infinst/infinst.rbuild (with props) trunk/reactos/base/applications/utils/nts2w32err/nts2w32err.rbuild (with props) trunk/reactos/base/applications/utils/objdir/objdir.rbuild (with props) trunk/reactos/base/applications/utils/partinfo/partinfo.rbuild (with props) Modified: trunk/reactos/base/applications/utils/driver/load/load.c trunk/reactos/base/applications/utils/driver/unload/unload.c trunk/reactos/base/applications/utils/nts2w32err/nts2w32err.c trunk/reactos/base/applications/utils/objdir/objdir.c trunk/reactos/base/applications/utils/partinfo/partinfo.c trunk/reactos/base/applications/utils/utils.rbuild Added: trunk/reactos/base/applications/utils/cat/cat.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/utils/ca… ============================================================================== --- trunk/reactos/base/applications/utils/cat/cat.rbuild (added) +++ trunk/reactos/base/applications/utils/cat/cat.rbuild Fri Oct 13 14:56:52 2006 @@ -1,0 +1,7 @@ +<module name="cat" type="win32cui" installbase="bin" installname="cat.exe" > + <define name="__USE_W32API" /> + <library>msvcrt</library> + <library>kernel32</library> + <library>ntdll</library> + <file>cat.c</file> +</module> Propchange: trunk/reactos/base/applications/utils/cat/cat.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/utils/driver/driver.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/utils/dr… ============================================================================== --- trunk/reactos/base/applications/utils/driver/driver.rbuild (added) +++ trunk/reactos/base/applications/utils/driver/driver.rbuild Fri Oct 13 14:56:52 2006 @@ -1,0 +1,8 @@ +<group> +<directory name="load"> + <xi:include href="load/load.rbuild" /> +</directory> +<directory name="unload"> + <xi:include href="unload/unload.rbuild" /> +</directory> +</group> Propchange: trunk/reactos/base/applications/utils/driver/driver.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/utils/driver/load/load.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/utils/dr… ============================================================================== --- trunk/reactos/base/applications/utils/driver/load/load.c (original) +++ trunk/reactos/base/applications/utils/driver/load/load.c Fri Oct 13 14:56:52 2006 @@ -1,31 +1,32 @@ /* * Load a device driver */ +#define WIN32_NO_STATUS #include <windows.h> -#include <ntos/zw.h> +#include <stdlib.h> +#include <ntndk.h> -int -main(int argc, char *argv[]) +int wmain(int argc, WCHAR * argv[]) { NTSTATUS Status; UNICODE_STRING ServiceName; if (argc != 2) { - printf("Usage: load <ServiceName>\n"); + wprintf(L"Usage: load <ServiceName>\n"); return 0; } - ServiceName.Length = (strlen(argv[1]) + 52) * sizeof(WCHAR); + ServiceName.Length = (wcslen(argv[1]) + 52) * sizeof(WCHAR); ServiceName.Buffer = (LPWSTR)malloc(ServiceName.Length + sizeof(UNICODE_NULL)); wsprintf(ServiceName.Buffer, L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\%S", argv[1]); - wprintf(L"%s %d %d\n", ServiceName.Buffer, ServiceName.Length, wcslen(ServiceName.Buffer)); + wprintf(L"%s %u %d\n", ServiceName.Buffer, ServiceName.Length, wcslen(ServiceName.Buffer)); Status = NtLoadDriver(&ServiceName); free(ServiceName.Buffer); if (!NT_SUCCESS(Status)) { - printf("Failed: %X\n", Status); + wprintf(L"Failed: %x\n", Status); return 1; } return 0; Added: trunk/reactos/base/applications/utils/driver/load/load.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/utils/dr… ============================================================================== --- trunk/reactos/base/applications/utils/driver/load/load.rbuild (added) +++ trunk/reactos/base/applications/utils/driver/load/load.rbuild Fri Oct 13 14:56:52 2006 @@ -1,0 +1,8 @@ +<module name="load" type="win32cui" installbase="bin" installname="load.exe" unicode="true" > + <define name="__USE_W32API" /> + <library>msvcrt</library> + <library>kernel32</library> + <library>ntdll</library> + <library>user32</library> + <file>load.c</file> +</module> Propchange: trunk/reactos/base/applications/utils/driver/load/load.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/utils/driver/unload/unload.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/utils/dr… ============================================================================== --- trunk/reactos/base/applications/utils/driver/unload/unload.c (original) +++ trunk/reactos/base/applications/utils/driver/unload/unload.c Fri Oct 13 14:56:52 2006 @@ -1,21 +1,22 @@ /* * Unload a device driver */ +#define WIN32_NO_STATUS #include <windows.h> -#include <ntos/zw.h> +#include <stdlib.h> +#include <ntndk.h> -int -main(int argc, char *argv[]) +int wmain(int argc, WCHAR * argv[]) { NTSTATUS Status; UNICODE_STRING ServiceName; if (argc != 2) { - printf("Usage: unload <ServiceName>\n"); + wprintf(L"Usage: unload <ServiceName>\n"); return 0; } - ServiceName.Length = (strlen(argv[1]) + 52) * sizeof(WCHAR); + ServiceName.Length = (wcslen(argv[1]) + 52) * sizeof(WCHAR); ServiceName.Buffer = (LPWSTR)malloc(ServiceName.Length + sizeof(UNICODE_NULL)); wsprintf(ServiceName.Buffer, L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\%S", @@ -25,7 +26,7 @@ free(ServiceName.Buffer); if (!NT_SUCCESS(Status)) { - printf("Failed: %X\n", Status); + wprintf(L"Failed: %X\n", Status); return 1; } return 0; Added: trunk/reactos/base/applications/utils/driver/unload/unload.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/utils/dr… ============================================================================== --- trunk/reactos/base/applications/utils/driver/unload/unload.rbuild (added) +++ trunk/reactos/base/applications/utils/driver/unload/unload.rbuild Fri Oct 13 14:56:52 2006 @@ -1,0 +1,8 @@ +<module name="unload" type="win32cui" installbase="bin" installname="unload.exe" unicode="true"> + <define name="__USE_W32API" /> + <library>msvcrt</library> + <library>kernel32</library> + <library>ntdll</library> + <library>user32</library> + <file>unload.c</file> +</module> Propchange: trunk/reactos/base/applications/utils/driver/unload/unload.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/utils/infinst/infinst.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/utils/in… ============================================================================== --- trunk/reactos/base/applications/utils/infinst/infinst.rbuild (added) +++ trunk/reactos/base/applications/utils/infinst/infinst.rbuild Fri Oct 13 14:56:52 2006 @@ -1,0 +1,10 @@ +<module name="infinst" type="win32cui" installbase="bin" installname="infinst.exe" > + <define name="__USE_W32API" /> + <library>msvcrt</library> + <library>kernel32</library> + <library>ntdll</library> + <library>user32</library> + <library>setupapi</library> + <library>comdlg32</library> + <file>infinst.c</file> +</module> Propchange: trunk/reactos/base/applications/utils/infinst/infinst.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/utils/nts2w32err/nts2w32err.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/utils/nt… ============================================================================== --- trunk/reactos/base/applications/utils/nts2w32err/nts2w32err.c (original) +++ trunk/reactos/base/applications/utils/nts2w32err/nts2w32err.c Fri Oct 13 14:56:52 2006 @@ -12,9 +12,10 @@ * 2004-01-10 Emanuele Aliberti * */ +#define WIN32_NO_STATUS #include <windows.h> -#include <ntddk.h> - +#include <stdlib.h> +#include <ntndk.h> #include <stdio.h> int main (int argc, char * argv []) Added: trunk/reactos/base/applications/utils/nts2w32err/nts2w32err.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/utils/nt… ============================================================================== --- trunk/reactos/base/applications/utils/nts2w32err/nts2w32err.rbuild (added) +++ trunk/reactos/base/applications/utils/nts2w32err/nts2w32err.rbuild Fri Oct 13 14:56:52 2006 @@ -1,0 +1,7 @@ +<module name="nts2w32err" type="win32cui" installbase="bin" installname="nts2w32err.exe" > + <define name="__USE_W32API" /> + <library>msvcrt</library> + <library>kernel32</library> + <library>ntdll</library> + <file>nts2w32err.c</file> +</module> Propchange: trunk/reactos/base/applications/utils/nts2w32err/nts2w32err.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/utils/objdir/objdir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/utils/ob… ============================================================================== --- trunk/reactos/base/applications/utils/objdir/objdir.c (original) +++ trunk/reactos/base/applications/utils/objdir/objdir.c Fri Oct 13 14:56:52 2006 @@ -17,11 +17,11 @@ * Added -r option. */ -#include <ntddk.h> -#include <stdarg.h> -#include <string.h> +#define WIN32_NO_STATUS +#include <windows.h> +#include <stdlib.h> +#include <ntndk.h> #include <stdio.h> -#include <stdlib.h> #define MAX_DIR_ENTRY 256 Added: trunk/reactos/base/applications/utils/objdir/objdir.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/utils/ob… ============================================================================== --- trunk/reactos/base/applications/utils/objdir/objdir.rbuild (added) +++ trunk/reactos/base/applications/utils/objdir/objdir.rbuild Fri Oct 13 14:56:52 2006 @@ -1,0 +1,9 @@ +<module name="objdir" type="win32cui" installbase="bin" installname="objdir.exe"> + <define name="__USE_W32API" /> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <library>msvcrt</library> + <library>kernel32</library> + <library>ntdll</library> + <file>objdir.c</file> +</module> Propchange: trunk/reactos/base/applications/utils/objdir/objdir.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/utils/partinfo/partinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/utils/pa… ============================================================================== --- trunk/reactos/base/applications/utils/partinfo/partinfo.c (original) +++ trunk/reactos/base/applications/utils/partinfo/partinfo.c Fri Oct 13 14:56:52 2006 @@ -2,13 +2,11 @@ * partinfo - partition info program */ +#define WIN32_NO_STATUS #include <windows.h> -//#include <winioctl.h> -#include <string.h> +#include <stdlib.h> +#include <ntndk.h> #include <stdio.h> -#include <stdlib.h> - -#include <ntddk.h> //#define DUMP_DATA #define DUMP_SIZE_INFO Added: trunk/reactos/base/applications/utils/partinfo/partinfo.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/utils/pa… ============================================================================== --- trunk/reactos/base/applications/utils/partinfo/partinfo.rbuild (added) +++ trunk/reactos/base/applications/utils/partinfo/partinfo.rbuild Fri Oct 13 14:56:52 2006 @@ -1,0 +1,7 @@ +<module name="partinfo" type="win32cui" installbase="bin" installname="partinfo.exe"> + <define name="__USE_W32API" /> + <library>msvcrt</library> + <library>kernel32</library> + <library>ntdll</library> + <file>partinfo.c</file> +</module> Propchange: trunk/reactos/base/applications/utils/partinfo/partinfo.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/utils/utils.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/utils/ut… ============================================================================== --- trunk/reactos/base/applications/utils/utils.rbuild (original) +++ trunk/reactos/base/applications/utils/utils.rbuild Fri Oct 13 14:56:52 2006 @@ -1,6 +1,24 @@ <group> <directory name="binpatch"> <xi:include href="binpatch/binpatch.rbuild" /> +</directory> +<directory name="cat"> + <xi:include href="cat/cat.rbuild" /> +</directory> +<directory name="driver"> + <xi:include href="driver/driver.rbuild" /> +</directory> +<directory name="infinst"> + <xi:include href="infinst/infinst.rbuild" /> +</directory> +<directory name="nts2w32err"> + <xi:include href="nts2w32err/nts2w32err.rbuild" /> +</directory> +<directory name="objdir"> + <xi:include href="objdir/objdir.rbuild" /> +</directory> +<directory name="partinfo"> + <xi:include href="partinfo/partinfo.rbuild" /> </directory> <directory name="ps"> <xi:include href="ps/ps.rbuild" />

1 0

[janderwald] 24500: - add binpatch to build system - fix a gcc warning
by janderwald＠svn.reactos.org 13 Oct '06

13 Oct '06

Author: janderwald Date: Fri Oct 13 13:56:30 2006 New Revision: 24500 URL: http://svn.reactos.org/svn/reactos?rev=24500&view=rev Log: - add binpatch to build system - fix a gcc warning Added: trunk/reactos/base/applications/utils/binpatch/binpatch.rbuild (with props) Modified: trunk/reactos/base/applications/utils/binpatch/patch.c trunk/reactos/base/applications/utils/utils.rbuild Added: trunk/reactos/base/applications/utils/binpatch/binpatch.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/utils/bi… ============================================================================== --- trunk/reactos/base/applications/utils/binpatch/binpatch.rbuild (added) +++ trunk/reactos/base/applications/utils/binpatch/binpatch.rbuild Fri Oct 13 13:56:30 2006 @@ -1,0 +1,7 @@ +<module name="binpatch" type="win32cui" installbase="bin" installname="binpatch.exe" > + <define name="__USE_W32API" /> + <library>msvcrt</library> + <library>kernel32</library> + <library>ntdll</library> + <file>patch.c</file> +</module> Propchange: trunk/reactos/base/applications/utils/binpatch/binpatch.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/utils/binpatch/patch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/utils/bi… ============================================================================== --- trunk/reactos/base/applications/utils/binpatch/patch.c (original) +++ trunk/reactos/base/applications/utils/binpatch/patch.c Fri Oct 13 13:56:30 2006 @@ -211,7 +211,7 @@ static int outputPatch(const char *outputFileName) { - unsigned char *patchExe, *patchBuffer; + unsigned char *patchExe, *patchBuffer = NULL; int i, size, patchExeSize, patchSize, stringSize, stringOffset, patchOffset; Patch *patch; PatchedFile *files; Modified: trunk/reactos/base/applications/utils/utils.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/utils/ut… ============================================================================== --- trunk/reactos/base/applications/utils/utils.rbuild (original) +++ trunk/reactos/base/applications/utils/utils.rbuild Fri Oct 13 13:56:30 2006 @@ -1,4 +1,7 @@ <group> +<directory name="binpatch"> + <xi:include href="binpatch/binpatch.rbuild" /> +</directory> <directory name="ps"> <xi:include href="ps/ps.rbuild" /> </directory>

1 0

[janderwald] 24499: - give stats an rbuild file - compile stats as an unicode app
by janderwald＠svn.reactos.org 13 Oct '06

13 Oct '06

Author: janderwald Date: Fri Oct 13 13:41:59 2006 New Revision: 24499 URL: http://svn.reactos.org/svn/reactos?rev=24499&view=rev Log: - give stats an rbuild file - compile stats as an unicode app Added: trunk/reactos/base/applications/utils/stats/stats.rbuild (with props) Modified: trunk/reactos/base/applications/utils/stats/stats.c trunk/reactos/base/applications/utils/utils.rbuild Modified: trunk/reactos/base/applications/utils/stats/stats.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/utils/st… ============================================================================== --- trunk/reactos/base/applications/utils/stats/stats.c (original) +++ trunk/reactos/base/applications/utils/stats/stats.c Fri Oct 13 13:41:59 2006 @@ -443,13 +443,9 @@ } -int -main (int argc, char * argv []) +int _tmain(int argc, _TCHAR * argv[]) { int a; -#if UNICODE - TCHAR Path[MAX_PATH + 1]; -#endif _tprintf (_T("ReactOS Project Statistics\n")); _tprintf (_T("==========================\n\n")); @@ -469,28 +465,13 @@ for(a = 1; a < argc - 1; a++) { -#if UNICODE - int len = lstrlenA(argv[a]); - TCHAR *str = (TCHAR*)HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(TCHAR)); - if(MultiByteToWideChar(CP_ACP, 0, argv[a], -1, str, len + 1) > 0) - Options[a - 1] = str; - else - Options[a - 1] = NULL; -#else Options[a - 1] = argv[a]; -#endif } SkipEmptyLines = IsOptionSet(_T("-e")); BeSilent = IsOptionSet(_T("-s")); -#if UNICODE - ZeroMemory(Path, sizeof(Path)); - if(MultiByteToWideChar(CP_ACP, 0, argv[argc - 1], -1, Path, MAX_PATH) > 0) - Execute (Path); -#else Execute (argv[argc - 1]); -#endif Cleanup(); return 0; Added: trunk/reactos/base/applications/utils/stats/stats.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/utils/st… ============================================================================== --- trunk/reactos/base/applications/utils/stats/stats.rbuild (added) +++ trunk/reactos/base/applications/utils/stats/stats.rbuild Fri Oct 13 13:41:59 2006 @@ -1,0 +1,9 @@ +<module name="stats" type="win32cui" installbase="bin" installname="stats.exe" unicode="true" > + <define name="__USE_W32API" /> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <library>msvcrt</library> + <library>kernel32</library> + <library>ntdll</library> + <file>stats.c</file> +</module> Propchange: trunk/reactos/base/applications/utils/stats/stats.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/utils/utils.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/utils/ut… ============================================================================== --- trunk/reactos/base/applications/utils/utils.rbuild (original) +++ trunk/reactos/base/applications/utils/utils.rbuild Fri Oct 13 13:41:59 2006 @@ -5,6 +5,9 @@ <directory name="rosperf"> <xi:include href="rosperf/rosperf.rbuild" /> </directory> +<directory name="stats"> + <xi:include href="stats/stats.rbuild" /> +</directory> <directory name="tickcount"> <xi:include href="tickcount/tickcount.rbuild" /> </directory>

1 0

[janderwald] 24498: - give tickcount a rbuild file
by janderwald＠svn.reactos.org 13 Oct '06

13 Oct '06

Author: janderwald Date: Fri Oct 13 13:16:34 2006 New Revision: 24498 URL: http://svn.reactos.org/svn/reactos?rev=24498&view=rev Log: - give tickcount a rbuild file Added: trunk/reactos/base/applications/utils/tickcount/tickcount.rbuild (with props) Modified: trunk/reactos/base/applications/utils/utils.rbuild Added: trunk/reactos/base/applications/utils/tickcount/tickcount.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/utils/ti… ============================================================================== --- trunk/reactos/base/applications/utils/tickcount/tickcount.rbuild (added) +++ trunk/reactos/base/applications/utils/tickcount/tickcount.rbuild Fri Oct 13 13:16:34 2006 @@ -1,0 +1,9 @@ +<module name="tickcount" type="win32cui" installbase="bin" installname="tickcount.exe" unicode="true" > + <define name="__USE_W32API" /> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <library>msvcrt</library> + <library>kernel32</library> + <library>ntdll</library> + <file>tickcount.c</file> +</module> Propchange: trunk/reactos/base/applications/utils/tickcount/tickcount.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/utils/utils.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/utils/ut… ============================================================================== --- trunk/reactos/base/applications/utils/utils.rbuild (original) +++ trunk/reactos/base/applications/utils/utils.rbuild Fri Oct 13 13:16:34 2006 @@ -5,4 +5,7 @@ <directory name="rosperf"> <xi:include href="rosperf/rosperf.rbuild" /> </directory> +<directory name="tickcount"> + <xi:include href="tickcount/tickcount.rbuild" /> +</directory> </group>

1 0

[fireball] 24497: Move unmaintained stuff (cis, os2, rosky, vms, and msvc6) to a respective branch [02/02]
by fireball＠svn.reactos.org 13 Oct '06

13 Oct '06

Author: fireball Date: Fri Oct 13 13:03:51 2006 New Revision: 24497 URL: http://svn.reactos.org/svn/reactos?rev=24497&view=rev Log: Move unmaintained stuff (cis, os2, rosky, vms, and msvc6) to a respective branch [02/02] Removed: trunk/cis/ trunk/msvc6/ trunk/os2/ trunk/rosky/ trunk/vms/

1 0

[fireball] 24496: Move unmaintained stuff (cis, os2, rosky, vms, and msvc6) to a respective branch [01/02]
by fireball＠svn.reactos.org 13 Oct '06

13 Oct '06

Author: fireball Date: Fri Oct 13 13:00:21 2006 New Revision: 24496 URL: http://svn.reactos.org/svn/reactos?rev=24496&view=rev Log: Move unmaintained stuff (cis, os2, rosky, vms, and msvc6) to a respective branch [01/02] Added: branches/unmaintained/ branches/unmaintained/cis/ - copied from r24495, trunk/cis/ branches/unmaintained/msvc6/ - copied from r24495, trunk/msvc6/ branches/unmaintained/os2/ - copied from r24495, trunk/os2/ branches/unmaintained/rosky/ - copied from r24495, trunk/rosky/ branches/unmaintained/vms/ - copied from r24495, trunk/vms/ Modified: branches/unmaintained/msvc6/def_converter/makefile branches/unmaintained/msvc6/iface/native/genntdll.c branches/unmaintained/msvc6/iface/native/makefile branches/unmaintained/msvc6/ntoskrnl/ke_i386_bthread.c branches/unmaintained/msvc6/ntoskrnl/mm_mminit_msvc.c branches/unmaintained/os2/apps/bepslep/Makefile branches/unmaintained/os2/lib/doscalls/devices/ioctl_async.cpp branches/unmaintained/os2/lib/doscalls/doscalls.def branches/unmaintained/os2/lib/doscalls/doscalls.def.bak branches/unmaintained/os2/lib/doscalls/doscalls.edf branches/unmaintained/os2/lib/doscalls/makefile Modified: branches/unmaintained/msvc6/def_converter/makefile URL: http://svn.reactos.org/svn/reactos/branches/unmaintained/msvc6/def_converte… ============================================================================== --- branches/unmaintained/msvc6/def_converter/makefile (original) +++ branches/unmaintained/msvc6/def_converter/makefile Fri Oct 13 13:00:21 2006 @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.1 2004/02/06 08:21:54 fireball Exp $ +# $Id$ # # ReactOS Operating System - .def converter for HAL and the kernel # Modified: branches/unmaintained/msvc6/iface/native/genntdll.c URL: http://svn.reactos.org/svn/reactos/branches/unmaintained/msvc6/iface/native… ============================================================================== --- branches/unmaintained/msvc6/iface/native/genntdll.c (original) +++ branches/unmaintained/msvc6/iface/native/genntdll.c Fri Oct 13 13:00:21 2006 @@ -1,4 +1,4 @@ -/* $Id: genntdll.c,v 1.1 2004/02/06 08:21:56 fireball Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS version of ntdll Modified: branches/unmaintained/msvc6/iface/native/makefile URL: http://svn.reactos.org/svn/reactos/branches/unmaintained/msvc6/iface/native… ============================================================================== --- branches/unmaintained/msvc6/iface/native/makefile (original) +++ branches/unmaintained/msvc6/iface/native/makefile Fri Oct 13 13:00:21 2006 @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.1 2004/02/06 08:21:56 fireball Exp $ +# $Id$ # # ReactOS Operating System - MSVC6 Zw functions stubs to call generator # Modified: branches/unmaintained/msvc6/ntoskrnl/ke_i386_bthread.c URL: http://svn.reactos.org/svn/reactos/branches/unmaintained/msvc6/ntoskrnl/ke_… ============================================================================== --- branches/unmaintained/msvc6/ntoskrnl/ke_i386_bthread.c (original) +++ branches/unmaintained/msvc6/ntoskrnl/ke_i386_bthread.c Fri Oct 13 13:00:21 2006 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: ke_i386_bthread.c,v 1.1 2004/02/06 08:21:56 fireball Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel Modified: branches/unmaintained/msvc6/ntoskrnl/mm_mminit_msvc.c URL: http://svn.reactos.org/svn/reactos/branches/unmaintained/msvc6/ntoskrnl/mm_… ============================================================================== --- branches/unmaintained/msvc6/ntoskrnl/mm_mminit_msvc.c (original) +++ branches/unmaintained/msvc6/ntoskrnl/mm_mminit_msvc.c Fri Oct 13 13:00:21 2006 @@ -1,4 +1,4 @@ -/* $Id: mm_mminit_msvc.c,v 1.1 2004/02/06 08:22:01 fireball Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top directory * PROJECT: ReactOS kernel Modified: branches/unmaintained/os2/apps/bepslep/Makefile URL: http://svn.reactos.org/svn/reactos/branches/unmaintained/os2/apps/bepslep/M… ============================================================================== --- branches/unmaintained/os2/apps/bepslep/Makefile (original) +++ branches/unmaintained/os2/apps/bepslep/Makefile Fri Oct 13 13:00:21 2006 @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.2 2003/01/07 16:23:10 robd Exp $ +# $Id$ # # Modified: branches/unmaintained/os2/lib/doscalls/devices/ioctl_async.cpp URL: http://svn.reactos.org/svn/reactos/branches/unmaintained/os2/lib/doscalls/d… ============================================================================== --- branches/unmaintained/os2/lib/doscalls/devices/ioctl_async.cpp (original) +++ branches/unmaintained/os2/lib/doscalls/devices/ioctl_async.cpp Fri Oct 13 13:00:21 2006 @@ -1,4 +1,4 @@ -/* $Id: ioctl_async.cpp,v 1.2 2004/01/31 01:29:11 robertk Exp $ +/* $Id$ */ /* * Modified: branches/unmaintained/os2/lib/doscalls/doscalls.def URL: http://svn.reactos.org/svn/reactos/branches/unmaintained/os2/lib/doscalls/d… ============================================================================== --- branches/unmaintained/os2/lib/doscalls/doscalls.def (original) +++ branches/unmaintained/os2/lib/doscalls/doscalls.def Fri Oct 13 13:00:21 2006 @@ -1,4 +1,4 @@ -; $Id: doscalls.def,v 1.6 2004/01/31 01:29:11 robertk Exp $ +; $Id$ ; ; Def for doscalls.dll - part of the OS/2-sub system ; for ReactOS. Provides Access to OS/2 kernel services. Modified: branches/unmaintained/os2/lib/doscalls/doscalls.def.bak URL: http://svn.reactos.org/svn/reactos/branches/unmaintained/os2/lib/doscalls/d… ============================================================================== --- branches/unmaintained/os2/lib/doscalls/doscalls.def.bak (original) +++ branches/unmaintained/os2/lib/doscalls/doscalls.def.bak Fri Oct 13 13:00:21 2006 @@ -1,4 +1,4 @@ -; $Id: doscalls.def.bak,v 1.1 2002/09/04 22:19:47 robertk Exp $ +; $Id$ ; ; Def for doscalls.dll - part of the OS/2-sub system ; for ReactOS. Provides Access to OS/2 kernel services. Modified: branches/unmaintained/os2/lib/doscalls/doscalls.edf URL: http://svn.reactos.org/svn/reactos/branches/unmaintained/os2/lib/doscalls/d… ============================================================================== --- branches/unmaintained/os2/lib/doscalls/doscalls.edf (original) +++ branches/unmaintained/os2/lib/doscalls/doscalls.edf Fri Oct 13 13:00:21 2006 @@ -1,4 +1,4 @@ -; $Id: doscalls.edf,v 1.4 2004/01/31 01:29:11 robertk Exp $ +; $Id$ ; ; Def for doscalls.dll - part of the OS/2-sub system ; for ReactOS. Provides Access to OS/2 kernel services. Modified: branches/unmaintained/os2/lib/doscalls/makefile URL: http://svn.reactos.org/svn/reactos/branches/unmaintained/os2/lib/doscalls/m… ============================================================================== --- branches/unmaintained/os2/lib/doscalls/makefile (original) +++ branches/unmaintained/os2/lib/doscalls/makefile Fri Oct 13 13:00:21 2006 @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.7 2004/01/31 01:29:11 robertk Exp $ +# $Id$ PATH_TO_TOP = ../../../reactos

1 0

[arty] 24495: Fixen. Delete is still broken. We now use BalancedRoot->Parent as the nil element and distinguish it from the embedded element. Fix null and root macros, assert macro and some other stuff.
by arty＠svn.reactos.org 13 Oct '06

13 Oct '06

Author: arty Date: Fri Oct 13 11:02:04 2006 New Revision: 24495 URL: http://svn.reactos.org/svn/reactos?rev=24495&view=rev Log: Fixen. Delete is still broken. We now use BalancedRoot->Parent as the nil element and distinguish it from the embedded element. Fix null and root macros, assert macro and some other stuff. Modified: trunk/reactos/lib/rtl/austin/avl.c trunk/reactos/lib/rtl/austin/macros.h trunk/reactos/lib/rtl/austin/tree.c trunk/reactos/lib/rtl/austin/tree.h trunk/reactos/lib/rtl/austin/udict.h trunk/reactos/lib/rtl/generictable.c Modified: trunk/reactos/lib/rtl/austin/avl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/austin/avl.c?rev=2… ============================================================================== --- trunk/reactos/lib/rtl/austin/avl.c (original) +++ trunk/reactos/lib/rtl/austin/avl.c Fri Oct 13 11:02:04 2006 @@ -36,8 +36,11 @@ void avl_init(udict_t *ud) { - ud->sentinel.left = ud->sentinel.right = ud->sentinel.parent = - &ud->sentinel; + ud->BalancedRoot.left = ud->BalancedRoot.right = + ud->BalancedRoot.parent = (udict_node_t*) + ud->AllocateRoutine(ud, sizeof(udict_node_t)); + ud->BalancedRoot.parent->left = ud->BalancedRoot.parent->right = + ud->BalancedRoot.parent->parent = ud->BalancedRoot.parent; } void RotateLeft(udict_node_t **top) @@ -197,7 +200,7 @@ node->right = nil; node->balance = BALANCED; - if (Insert(ud, node, &nil->left, nil)) { + if (Insert(ud, node, &ud->BalancedRoot.left, nil)) { nil->balance = LEFTHEAVY; }/*if*/ @@ -253,6 +256,7 @@ /* root has been deleted */ if (child == nil) { parent->balance = BALANCED; + ud->BalancedRoot.left = nil; }/*if*/ }/*if*/ @@ -297,9 +301,16 @@ }/*while*/ }/*avl_delete*/ +void *avl_get_data(udict_node_t *here) { + return data(here); +} + int avl_search(udict_t *ud, void *_key, udict_node_t *here, udict_node_t **where) { int result; + + if (avl_is_nil(ud, here)) + return TableInsertAsLeft; result = ud->compare(ud, _key, key(here)); @@ -309,14 +320,14 @@ } if (result == LESS) { - if( here->left == &ud->sentinel ) { + if( here->left == tree_null_priv(ud) ) { *where = here; return TableInsertAsLeft; } return avl_search(ud, _key, here->left, where); }/*if*/ else { - if( here->right == &ud->sentinel ) { + if( here->right == tree_null_priv(ud) ) { *where = here; return TableInsertAsRight; } @@ -326,7 +337,7 @@ int avl_is_nil(udict_t *ud, udict_node_t *node) { - return &ud->sentinel == node; + return tree_null_priv(ud) == node; } udict_node_t *avl_first(udict_t *ud) Modified: trunk/reactos/lib/rtl/austin/macros.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/austin/macros.h?re… ============================================================================== --- trunk/reactos/lib/rtl/austin/macros.h (original) +++ trunk/reactos/lib/rtl/austin/macros.h Fri Oct 13 11:02:04 2006 @@ -47,5 +47,5 @@ #define nodefree FreeRoutine #define context TableContext -#define assert(x) { if(x) { RtlAssert(#x, __FILE__, __LINE__, NULL); } } +#define assert(x) { if(!(x)) { RtlAssert(#x, __FILE__, __LINE__, NULL); } } Modified: trunk/reactos/lib/rtl/austin/tree.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/austin/tree.c?rev=… ============================================================================== --- trunk/reactos/lib/rtl/austin/tree.c (original) +++ trunk/reactos/lib/rtl/austin/tree.c Fri Oct 13 11:02:04 2006 @@ -82,7 +82,7 @@ if (node == delparent->left) { delparent->left = child; } else { - assert (node == delparent->right); + //assert (node == delparent->right); delparent->right = child; } } Modified: trunk/reactos/lib/rtl/austin/tree.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/austin/tree.h?rev=… ============================================================================== --- trunk/reactos/lib/rtl/austin/tree.h (original) +++ trunk/reactos/lib/rtl/austin/tree.h Fri Oct 13 11:02:04 2006 @@ -36,6 +36,6 @@ void udict_tree_rotate_left(udict_node_t *, udict_node_t *); void udict_tree_rotate_right(udict_node_t *, udict_node_t *); -#define tree_root_priv(T) ((T)->sentinel.left) -#define tree_null_priv(L) (&(L)->sentinel) +#define tree_root_priv(T) ((T)->BalancedRoot.left) +#define tree_null_priv(L) ((L)->BalancedRoot.parent) #define TREE_DEPTH_MAX 64 Modified: trunk/reactos/lib/rtl/austin/udict.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/austin/udict.h?rev… ============================================================================== --- trunk/reactos/lib/rtl/austin/udict.h (original) +++ trunk/reactos/lib/rtl/austin/udict.h Fri Oct 13 11:02:04 2006 @@ -56,9 +56,9 @@ } udict_rb_color_t; typedef enum { - udict_balanced, - udict_leftheavy, - udict_rightheavy + udict_balanced = 0, + udict_leftheavy = -1, + udict_rightheavy = 1 } udict_avl_balance_t; typedef union { Modified: trunk/reactos/lib/rtl/generictable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/generictable.c?rev… ============================================================================== --- trunk/reactos/lib/rtl/generictable.c (original) +++ trunk/reactos/lib/rtl/generictable.c Fri Oct 13 11:02:04 2006 @@ -60,7 +60,7 @@ PRTL_BALANCED_LINKS OurNodeOrParent; TABLE_SEARCH_RESULT OurSearchResult; - if( Table->NumberGenericTableElements ) + if( !Table->NumberGenericTableElements ) { *SearchResult = TableEmptyTree; *NodeOrParent = NULL; @@ -68,7 +68,8 @@ } OurSearchResult = avl_search - (Table, Buffer, &Table->BalancedRoot, &OurNodeOrParent); + (Table, Buffer, + Table->BalancedRoot.LeftChild, &OurNodeOrParent); if(SearchResult) *SearchResult = OurSearchResult; if(NodeOrParent) *NodeOrParent = OurNodeOrParent; @@ -129,7 +130,7 @@ if( Result == TableFoundNode ) { - avl_delete_node(Table, Buffer); + avl_delete_node(Table, Node); Table->FreeRoutine(Table, Node); return TRUE; } @@ -169,18 +170,15 @@ if( Restart ) { Table->RestartKey = avl_first(Table); + } + else + { + Table->RestartKey = avl_next(Table, Table->RestartKey); + } + if( !Table->RestartKey ) + return NULL; + else return avl_data(Table->RestartKey); - } - else - { - Table->RestartKey = avl_next(Table, Table->RestartKey); - if( avl_is_nil(Table, Table->RestartKey) ) - return NULL; - else - return avl_data(Table->RestartKey); - } - - return 0; } /* @@ -363,25 +361,19 @@ if(NewElement) *NewElement = FALSE; - if( Table->NumberGenericTableElements ) - { - OurSearchResult = TableEmptyTree; - OurNodeOrParent = NULL; - return NULL; - } - OurSearchResult = avl_search - (Table, Buffer, &Table->BalancedRoot, &OurNodeOrParent); + (Table, Buffer, + Table->BalancedRoot.LeftChild, &OurNodeOrParent); if(NodeOrParent) *NodeOrParent = OurNodeOrParent; if(SearchResult) *SearchResult = OurSearchResult; if(OurSearchResult == TableFoundNode) { - if(NewElement) - *NewElement = TRUE; - RtlCopyMemory(avl_data(OurNodeOrParent), Buffer, BufferSize); - return avl_data(OurNodeOrParent); + RtlDeleteElementGenericTableAvl(Table, Buffer); + return RtlInsertElementGenericTableFullAvl + (Table, Buffer, BufferSize, + NewElement, NodeOrParent, SearchResult); } else { @@ -392,6 +384,7 @@ if( !NewNode ) return NULL; + NewNode->Balance = 0; RtlCopyMemory(avl_data(NewNode), Buffer, BufferSize); OurNodeOrParent = NewNode;

1 0

[fireball] 24494: - Fix a mistake in low memory pages allocation algorithm (commit-reviewers, where are you? :))
by fireball＠svn.reactos.org 12 Oct '06

12 Oct '06

Author: fireball Date: Fri Oct 13 00:46:07 2006 New Revision: 24494 URL: http://svn.reactos.org/svn/reactos?rev=24494&view=rev Log: - Fix a mistake in low memory pages allocation algorithm (commit-reviewers, where are you? :)) Modified: trunk/reactos/boot/freeldr/freeldr/mm/meminit.c Modified: trunk/reactos/boot/freeldr/freeldr/mm/meminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/me… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/meminit.c (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/meminit.c Fri Oct 13 00:46:07 2006 @@ -362,7 +362,7 @@ if (AvailablePagesSoFar >= PagesNeeded) { - return Index; + return Index - AvailablePagesSoFar + 1; } } }

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
36
Older →

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 October 2006