Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sedwards] 12804: Why is gcc stupid....
by sedwards＠svn.reactos.com 04 Jan '05

04 Jan '05

Why is gcc stupid.... Modified: trunk/reactos/apps/utils/net/ftp/fake.c Modified: trunk/reactos/apps/utils/net/ftp/prototypes.h _____ Modified: trunk/reactos/apps/utils/net/ftp/fake.c --- trunk/reactos/apps/utils/net/ftp/fake.c 2005-01-04 21:40:25 UTC (rev 12803) +++ trunk/reactos/apps/utils/net/ftp/fake.c 2005-01-04 22:11:50 UTC (rev 12804) @@ -298,3 +298,47 @@ { return 0; } + +#ifndef __GNUC__ +#define EPOCHFILETIME (116444736000000000i64) +#else +#define EPOCHFILETIME (116444736000000000LL) +#endif + +struct timezone { + int tz_minuteswest; /* minutes W of Greenwich */ + int tz_dsttime; /* type of dst correction */ +}; + +__inline int gettimeofday(struct timeval *tv, struct timezone *tz) +{ + FILETIME ft; + LARGE_INTEGER li; + __int64 t; + static int tzflag; + + if (tv) + { + GetSystemTimeAsFileTime(&ft); + //li.LowPart = ft.dwLowDateTime; + //li.HighPart = ft.dwHighDateTime; + t = li.QuadPart; /* In 100-nanosecond intervals */ + t -= EPOCHFILETIME; /* Offset to the Epoch time */ + t /= 10; /* In microseconds */ + tv->tv_sec = (long)(t / 1000000); + tv->tv_usec = (long)(t % 1000000); + } + + if (tz) + { + if (!tzflag) + { + _tzset(); + tzflag++; + } + tz->tz_minuteswest = _timezone / 60; + tz->tz_dsttime = _daylight; + } + + return 0; +} _____ Modified: trunk/reactos/apps/utils/net/ftp/prototypes.h --- trunk/reactos/apps/utils/net/ftp/prototypes.h 2005-01-04 21:40:25 UTC (rev 12803) +++ trunk/reactos/apps/utils/net/ftp/prototypes.h 2005-01-04 22:11:50 UTC (rev 12804) @@ -30,50 +30,3 @@ int getit(int argc, char *argv[], int restartit, char *mode); static int token(void); int sleep(int time); - -#include <windows.h> -#include <time.h> - -#ifndef __GNUC__ -#define EPOCHFILETIME (116444736000000000i64) -#else -#define EPOCHFILETIME (116444736000000000LL) -#endif - -struct timezone { - int tz_minuteswest; /* minutes W of Greenwich */ - int tz_dsttime; /* type of dst correction */ -}; - -__inline int gettimeofday(struct timeval *tv, struct timezone *tz) -{ - FILETIME ft; - LARGE_INTEGER li; - __int64 t; - static int tzflag; - - if (tv) - { - GetSystemTimeAsFileTime(&ft); - //li.LowPart = ft.dwLowDateTime; - //li.HighPart = ft.dwHighDateTime; - t = li.QuadPart; /* In 100-nanosecond intervals */ - t -= EPOCHFILETIME; /* Offset to the Epoch time */ - t /= 10; /* In microseconds */ - tv->tv_sec = (long)(t / 1000000); - tv->tv_usec = (long)(t % 1000000); - } - - if (tz) - { - if (!tzflag) - { - _tzset(); - tzflag++; - } - tz->tz_minuteswest = _timezone / 60; - tz->tz_dsttime = _daylight; - } - - return 0; -}

1 0

[narnaoud] 12803: Fix personal info.
by narnaoud＠svn.reactos.com 04 Jan '05

04 Jan '05

Fix personal info. Modified: trunk/rosapps/sysutils/regexpl/ArgumentParser.cpp Modified: trunk/rosapps/sysutils/regexpl/Completion.cpp Modified: trunk/rosapps/sysutils/regexpl/Console.cpp Modified: trunk/rosapps/sysutils/regexpl/Pattern.cpp Modified: trunk/rosapps/sysutils/regexpl/Prompt.cpp Modified: trunk/rosapps/sysutils/regexpl/RegistryExplorer.cpp Modified: trunk/rosapps/sysutils/regexpl/RegistryKey.cpp Modified: trunk/rosapps/sysutils/regexpl/RegistryTree.cpp Modified: trunk/rosapps/sysutils/regexpl/SecurityDescriptor.cpp Modified: trunk/rosapps/sysutils/regexpl/Settings.cpp Modified: trunk/rosapps/sysutils/regexpl/ShellCommand.cpp Modified: trunk/rosapps/sysutils/regexpl/ShellCommandChangeKey.cpp Modified: trunk/rosapps/sysutils/regexpl/ShellCommandConnect.cpp Modified: trunk/rosapps/sysutils/regexpl/ShellCommandDACL.cpp Modified: trunk/rosapps/sysutils/regexpl/ShellCommandDOKA.cpp Modified: trunk/rosapps/sysutils/regexpl/ShellCommandDeleteKey.cpp Modified: trunk/rosapps/sysutils/regexpl/ShellCommandDeleteValue.cpp Modified: trunk/rosapps/sysutils/regexpl/ShellCommandDir.cpp Modified: trunk/rosapps/sysutils/regexpl/ShellCommandExit.cpp Modified: trunk/rosapps/sysutils/regexpl/ShellCommandHelp.cpp Modified: trunk/rosapps/sysutils/regexpl/ShellCommandNewKey.cpp Modified: trunk/rosapps/sysutils/regexpl/ShellCommandOwner.cpp Modified: trunk/rosapps/sysutils/regexpl/ShellCommandSACL.cpp Modified: trunk/rosapps/sysutils/regexpl/ShellCommandSetValue.cpp Modified: trunk/rosapps/sysutils/regexpl/ShellCommandValue.cpp Modified: trunk/rosapps/sysutils/regexpl/ShellCommandVersion.cpp Modified: trunk/rosapps/sysutils/regexpl/ShellCommandsLinkedList.cpp Modified: trunk/rosapps/sysutils/regexpl/TextHistory.cpp Modified: trunk/rosapps/sysutils/regexpl/regexpl.rc _____ Modified: trunk/rosapps/sysutils/regexpl/ArgumentParser.cpp --- trunk/rosapps/sysutils/regexpl/ArgumentParser.cpp 2005-01-04 21:36:26 UTC (rev 12802) +++ trunk/rosapps/sysutils/regexpl/ArgumentParser.cpp 2005-01-04 21:40:25 UTC (rev 12803) @@ -1,8 +1,8 @@ -/* $Id: ArgumentParser.cpp,v 1.7 2003/02/05 03:18:57 narnaoud Exp $ +/* $Id$ * * regexpl - Console Registry Explorer * - * Copyright (C) 2000,2001 Nedko Arnaoudov <nedkohome(a)atia.com> + * Copyright (C) 2000-2005 Nedko Arnaudov <nedko(a)users.sourceforge.net> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by _____ Modified: trunk/rosapps/sysutils/regexpl/Completion.cpp --- trunk/rosapps/sysutils/regexpl/Completion.cpp 2005-01-04 21:36:26 UTC (rev 12802) +++ trunk/rosapps/sysutils/regexpl/Completion.cpp 2005-01-04 21:40:25 UTC (rev 12803) @@ -1,8 +1,8 @@ -/* $Id: Completion.cpp,v 1.2 2001/01/13 23:54:07 narnaoud Exp $ +/* $Id$ * * regexpl - Console Registry Explorer * - * Copyright (C) 2000,2001 Nedko Arnaoudov <nedkohome(a)atia.com> + * Copyright (C) 2000-2005 Nedko Arnaudov <nedko(a)users.sourceforge.net> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by _____ Modified: trunk/rosapps/sysutils/regexpl/Console.cpp --- trunk/rosapps/sysutils/regexpl/Console.cpp 2005-01-04 21:36:26 UTC (rev 12802) +++ trunk/rosapps/sysutils/regexpl/Console.cpp 2005-01-04 21:40:25 UTC (rev 12803) @@ -1,8 +1,8 @@ -/* $Id: Console.cpp,v 1.6 2001/05/16 21:19:06 narnaoud Exp $ +/* $Id$ * * regexpl - Console Registry Explorer * - * Copyright (C) 2000,2001 Nedko Arnaoudov <nedkohome(a)atia.com> + * Copyright (C) 2000-2005 Nedko Arnaudov <nedko(a)users.sourceforge.net> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by _____ Modified: trunk/rosapps/sysutils/regexpl/Pattern.cpp --- trunk/rosapps/sysutils/regexpl/Pattern.cpp 2005-01-04 21:36:26 UTC (rev 12802) +++ trunk/rosapps/sysutils/regexpl/Pattern.cpp 2005-01-04 21:40:25 UTC (rev 12803) @@ -1,8 +1,8 @@ -/* $Id: Pattern.cpp,v 1.2 2001/01/13 23:54:40 narnaoud Exp $ +/* $Id$ * * regexpl - Console Registry Explorer * - * Copyright (C) 2000,2001 Nedko Arnaoudov <nedkohome(a)atia.com> + * Copyright (C) 2000-2005 Nedko Arnaudov <nedko(a)users.sourceforge.net> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by _____ Modified: trunk/rosapps/sysutils/regexpl/Prompt.cpp --- trunk/rosapps/sysutils/regexpl/Prompt.cpp 2005-01-04 21:36:26 UTC (rev 12802) +++ trunk/rosapps/sysutils/regexpl/Prompt.cpp 2005-01-04 21:40:25 UTC (rev 12803) @@ -1,8 +1,8 @@ -/* $Id: Prompt.cpp,v 1.1 2001/04/16 04:53:31 narnaoud Exp $ +/* $Id$ * * regexpl - Console Registry Explorer * - * Copyright (C) 2000,2001 Nedko Arnaoudov <nedkohome(a)atia.com> + * Copyright (C) 2000-2005 Nedko Arnaudov <nedko(a)users.sourceforge.net> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by _____ Modified: trunk/rosapps/sysutils/regexpl/RegistryExplorer.cpp --- trunk/rosapps/sysutils/regexpl/RegistryExplorer.cpp 2005-01-04 21:36:26 UTC (rev 12802) +++ trunk/rosapps/sysutils/regexpl/RegistryExplorer.cpp 2005-01-04 21:40:25 UTC (rev 12803) @@ -1,8 +1,8 @@ -/* $Id: RegistryExplorer.cpp,v 1.8 2001/05/03 22:41:16 narnaoud Exp $ +/* $Id$ * * regexpl - Console Registry Explorer * - * Copyright (C) 2000,2001 Nedko Arnaoudov <nedkohome(a)atia.com> + * Copyright (C) 2000-2005 Nedko Arnaudov <nedko(a)users.sourceforge.net> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by _____ Modified: trunk/rosapps/sysutils/regexpl/RegistryKey.cpp --- trunk/rosapps/sysutils/regexpl/RegistryKey.cpp 2005-01-04 21:36:26 UTC (rev 12802) +++ trunk/rosapps/sysutils/regexpl/RegistryKey.cpp 2005-01-04 21:40:25 UTC (rev 12803) @@ -1,8 +1,8 @@ -/* $Id: RegistryKey.cpp,v 1.6 2002/09/03 18:44:18 chorns Exp $ +/* $Id$ * * regexpl - Console Registry Explorer * - * Copyright (C) 2000,2001 Nedko Arnaoudov <nedkohome(a)atia.com> + * Copyright (C) 2000-2005 Nedko Arnaudov <nedko(a)users.sourceforge.net> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by _____ Modified: trunk/rosapps/sysutils/regexpl/RegistryTree.cpp --- trunk/rosapps/sysutils/regexpl/RegistryTree.cpp 2005-01-04 21:36:26 UTC (rev 12802) +++ trunk/rosapps/sysutils/regexpl/RegistryTree.cpp 2005-01-04 21:40:25 UTC (rev 12803) @@ -1,8 +1,8 @@ -/* $Id: RegistryTree.cpp,v 1.6 2001/04/24 22:32:31 narnaoud Exp $ +/* $Id$ * * regexpl - Console Registry Explorer * - * Copyright (C) 2000,2001 Nedko Arnaoudov <nedkohome(a)atia.com> + * Copyright (C) 2000-2005 Nedko Arnaudov <nedko(a)users.sourceforge.net> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by _____ Modified: trunk/rosapps/sysutils/regexpl/SecurityDescriptor.cpp --- trunk/rosapps/sysutils/regexpl/SecurityDescriptor.cpp 2005-01-04 21:36:26 UTC (rev 12802) +++ trunk/rosapps/sysutils/regexpl/SecurityDescriptor.cpp 2005-01-04 21:40:25 UTC (rev 12803) @@ -1,8 +1,8 @@ -/* $Id: SecurityDescriptor.cpp,v 1.5 2001/07/14 07:01:38 narnaoud Exp $ +/* $Id$ * * regexpl - Console Registry Explorer * - * Copyright (C) 2000,2001 Nedko Arnaoudov <nedkohome(a)atia.com> + * Copyright (C) 2000-2005 Nedko Arnaudov <nedko(a)users.sourceforge.net> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by _____ Modified: trunk/rosapps/sysutils/regexpl/Settings.cpp --- trunk/rosapps/sysutils/regexpl/Settings.cpp 2005-01-04 21:36:26 UTC (rev 12802) +++ trunk/rosapps/sysutils/regexpl/Settings.cpp 2005-01-04 21:40:25 UTC (rev 12803) @@ -1,8 +1,8 @@ -/* $Id: Settings.cpp,v 1.2 2001/04/24 22:53:00 narnaoud Exp $ +/* $Id$ * * regexpl - Console Registry Explorer * - * Copyright (C) 2000,2001 Nedko Arnaoudov <nedkohome(a)atia.com> + * Copyright (C) 2000-2005 Nedko Arnaudov <nedko(a)users.sourceforge.net> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by _____ Modified: trunk/rosapps/sysutils/regexpl/ShellCommand.cpp --- trunk/rosapps/sysutils/regexpl/ShellCommand.cpp 2005-01-04 21:36:26 UTC (rev 12802) +++ trunk/rosapps/sysutils/regexpl/ShellCommand.cpp 2005-01-04 21:40:25 UTC (rev 12803) @@ -1,8 +1,8 @@ -/* $Id: ShellCommand.cpp,v 1.3 2001/01/13 23:55:36 narnaoud Exp $ +/* $Id$ * * regexpl - Console Registry Explorer * - * Copyright (C) 2000,2001 Nedko Arnaoudov <nedkohome(a)atia.com> + * Copyright (C) 2000-2005 Nedko Arnaudov <nedko(a)users.sourceforge.net> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by _____ Modified: trunk/rosapps/sysutils/regexpl/ShellCommandChangeKey.cpp --- trunk/rosapps/sysutils/regexpl/ShellCommandChangeKey.cpp 2005-01-04 21:36:26 UTC (rev 12802) +++ trunk/rosapps/sysutils/regexpl/ShellCommandChangeKey.cpp 2005-01-04 21:40:25 UTC (rev 12803) @@ -1,8 +1,8 @@ -/* $Id: ShellCommandChangeKey.cpp,v 1.4 2001/01/13 23:55:36 narnaoud Exp $ +/* $Id$ * * regexpl - Console Registry Explorer * - * Copyright (C) 2000,2001 Nedko Arnaoudov <nedkohome(a)atia.com> + * Copyright (C) 2000-2005 Nedko Arnaudov <nedko(a)users.sourceforge.net> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by _____ Modified: trunk/rosapps/sysutils/regexpl/ShellCommandConnect.cpp --- trunk/rosapps/sysutils/regexpl/ShellCommandConnect.cpp 2005-01-04 21:36:26 UTC (rev 12802) +++ trunk/rosapps/sysutils/regexpl/ShellCommandConnect.cpp 2005-01-04 21:40:25 UTC (rev 12803) @@ -1,8 +1,8 @@ -/* $Id: ShellCommandConnect.cpp,v 1.4 2001/01/13 23:55:36 narnaoud Exp $ +/* $Id$ * * regexpl - Console Registry Explorer * - * Copyright (C) 2000,2001 Nedko Arnaoudov <nedkohome(a)atia.com> + * Copyright (C) 2000-2005 Nedko Arnaudov <nedko(a)users.sourceforge.net> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by _____ Modified: trunk/rosapps/sysutils/regexpl/ShellCommandDACL.cpp --- trunk/rosapps/sysutils/regexpl/ShellCommandDACL.cpp 2005-01-04 21:36:26 UTC (rev 12802) +++ trunk/rosapps/sysutils/regexpl/ShellCommandDACL.cpp 2005-01-04 21:40:25 UTC (rev 12803) @@ -1,8 +1,8 @@ -/* $Id: ShellCommandDACL.cpp,v 1.5 2004/10/11 01:24:22 sedwards Exp $ +/* $Id$ * * regexpl - Console Registry Explorer * - * Copyright (C) 2000,2001 Nedko Arnaoudov <nedkohome(a)atia.com> + * Copyright (C) 2000-2005 Nedko Arnaudov <nedko(a)users.sourceforge.net> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by _____ Modified: trunk/rosapps/sysutils/regexpl/ShellCommandDOKA.cpp --- trunk/rosapps/sysutils/regexpl/ShellCommandDOKA.cpp 2005-01-04 21:36:26 UTC (rev 12802) +++ trunk/rosapps/sysutils/regexpl/ShellCommandDOKA.cpp 2005-01-04 21:40:25 UTC (rev 12803) @@ -1,8 +1,8 @@ -/* $Id: ShellCommandDOKA.cpp,v 1.3 2001/01/13 23:55:37 narnaoud Exp $ +/* $Id$ * * regexpl - Console Registry Explorer * - * Copyright (C) 2000,2001 Nedko Arnaoudov <nedkohome(a)atia.com> + * Copyright (C) 2000-2005 Nedko Arnaudov <nedko(a)users.sourceforge.net> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by _____ Modified: trunk/rosapps/sysutils/regexpl/ShellCommandDeleteKey.cpp --- trunk/rosapps/sysutils/regexpl/ShellCommandDeleteKey.cpp 2005-01-04 21:36:26 UTC (rev 12802) +++ trunk/rosapps/sysutils/regexpl/ShellCommandDeleteKey.cpp 2005-01-04 21:40:25 UTC (rev 12803) @@ -1,8 +1,8 @@ -/* $Id: ShellCommandDeleteKey.cpp,v 1.4 2001/01/13 23:55:37 narnaoud Exp $ +/* $Id$ * * regexpl - Console Registry Explorer * - * Copyright (C) 2000,2001 Nedko Arnaoudov <nedkohome(a)atia.com> + * Copyright (C) 2000-2005 Nedko Arnaudov <nedko(a)users.sourceforge.net> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by _____ Modified: trunk/rosapps/sysutils/regexpl/ShellCommandDeleteValue.cpp --- trunk/rosapps/sysutils/regexpl/ShellCommandDeleteValue.cpp 2005-01-04 21:36:26 UTC (rev 12802) +++ trunk/rosapps/sysutils/regexpl/ShellCommandDeleteValue.cpp 2005-01-04 21:40:25 UTC (rev 12803) @@ -1,8 +1,8 @@ -/* $Id: ShellCommandDeleteValue.cpp,v 1.4 2001/01/13 23:55:37 narnaoud Exp $ +/* $Id$ * * regexpl - Console Registry Explorer * - * Copyright (C) 2000,2001 Nedko Arnaoudov <nedkohome(a)atia.com> + * Copyright (C) 2000-2005 Nedko Arnaudov <nedko(a)users.sourceforge.net> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by _____ Modified: trunk/rosapps/sysutils/regexpl/ShellCommandDir.cpp --- trunk/rosapps/sysutils/regexpl/ShellCommandDir.cpp 2005-01-04 21:36:26 UTC (rev 12802) +++ trunk/rosapps/sysutils/regexpl/ShellCommandDir.cpp 2005-01-04 21:40:25 UTC (rev 12803) @@ -1,8 +1,8 @@ -/* $Id: ShellCommandDir.cpp,v 1.5 2004/10/11 01:24:22 sedwards Exp $ +/* $Id$ * * regexpl - Console Registry Explorer * - * Copyright (C) 2000,2001 Nedko Arnaoudov <nedkohome(a)atia.com> + * Copyright (C) 2000-2005 Nedko Arnaudov <nedko(a)users.sourceforge.net> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by _____ Modified: trunk/rosapps/sysutils/regexpl/ShellCommandExit.cpp --- trunk/rosapps/sysutils/regexpl/ShellCommandExit.cpp 2005-01-04 21:36:26 UTC (rev 12802) +++ trunk/rosapps/sysutils/regexpl/ShellCommandExit.cpp 2005-01-04 21:40:25 UTC (rev 12803) @@ -1,8 +1,8 @@ -/* $Id: ShellCommandExit.cpp,v 1.3 2001/01/13 23:55:37 narnaoud Exp $ +/* $Id$ * * regexpl - Console Registry Explorer * - * Copyright (C) 2000,2001 Nedko Arnaoudov <nedkohome(a)atia.com> + * Copyright (C) 2000-2005 Nedko Arnaudov <nedko(a)users.sourceforge.net> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by _____ Modified: trunk/rosapps/sysutils/regexpl/ShellCommandHelp.cpp --- trunk/rosapps/sysutils/regexpl/ShellCommandHelp.cpp 2005-01-04 21:36:26 UTC (rev 12802) +++ trunk/rosapps/sysutils/regexpl/ShellCommandHelp.cpp 2005-01-04 21:40:25 UTC (rev 12803) @@ -1,8 +1,8 @@ -/* $Id: ShellCommandHelp.cpp,v 1.4 2001/01/13 23:55:37 narnaoud Exp $ +/* $Id$ * * regexpl - Console Registry Explorer * - * Copyright (C) 2000,2001 Nedko Arnaoudov <nedkohome(a)atia.com> + * Copyright (C) 2000-2005 Nedko Arnaudov <nedko(a)users.sourceforge.net> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by _____ Modified: trunk/rosapps/sysutils/regexpl/ShellCommandNewKey.cpp --- trunk/rosapps/sysutils/regexpl/ShellCommandNewKey.cpp 2005-01-04 21:36:26 UTC (rev 12802) +++ trunk/rosapps/sysutils/regexpl/ShellCommandNewKey.cpp 2005-01-04 21:40:25 UTC (rev 12803) @@ -1,8 +1,8 @@ -/* $Id: ShellCommandNewKey.cpp,v 1.4 2001/01/13 23:55:37 narnaoud Exp $ +/* $Id$ * * regexpl - Console Registry Explorer * - * Copyright (C) 2000,2001 Nedko Arnaoudov <nedkohome(a)atia.com> + * Copyright (C) 2000-2005 Nedko Arnaudov <nedko(a)users.sourceforge.net> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by _____ Modified: trunk/rosapps/sysutils/regexpl/ShellCommandOwner.cpp --- trunk/rosapps/sysutils/regexpl/ShellCommandOwner.cpp 2005-01-04 21:36:26 UTC (rev 12802) +++ trunk/rosapps/sysutils/regexpl/ShellCommandOwner.cpp 2005-01-04 21:40:25 UTC (rev 12803) @@ -1,8 +1,8 @@ -/* $Id: ShellCommandOwner.cpp,v 1.5 2004/10/11 01:24:22 sedwards Exp $ +/* $Id$ * * regexpl - Console Registry Explorer * - * Copyright (C) 2000,2001 Nedko Arnaoudov <nedkohome(a)atia.com> + * Copyright (C) 2000-2005 Nedko Arnaudov <nedko(a)users.sourceforge.net> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by _____ Modified: trunk/rosapps/sysutils/regexpl/ShellCommandSACL.cpp --- trunk/rosapps/sysutils/regexpl/ShellCommandSACL.cpp 2005-01-04 21:36:26 UTC (rev 12802) +++ trunk/rosapps/sysutils/regexpl/ShellCommandSACL.cpp 2005-01-04 21:40:25 UTC (rev 12803) @@ -1,8 +1,8 @@ -/* $Id: ShellCommandSACL.cpp,v 1.5 2004/10/11 01:24:22 sedwards Exp $ +/* $Id$ * * regexpl - Console Registry Explorer * - * Copyright (C) 2000,2001 Nedko Arnaoudov <nedkohome(a)atia.com> + * Copyright (C) 2000-2005 Nedko Arnaudov <nedko(a)users.sourceforge.net> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by _____ Modified: trunk/rosapps/sysutils/regexpl/ShellCommandSetValue.cpp --- trunk/rosapps/sysutils/regexpl/ShellCommandSetValue.cpp 2005-01-04 21:36:26 UTC (rev 12802) +++ trunk/rosapps/sysutils/regexpl/ShellCommandSetValue.cpp 2005-01-04 21:40:25 UTC (rev 12803) @@ -1,8 +1,8 @@ -/* $Id: ShellCommandSetValue.cpp,v 1.6 2001/04/24 23:05:56 narnaoud Exp $ +/* $Id$ * * regexpl - Console Registry Explorer * - * Copyright (C) 2000,2001 Nedko Arnaoudov <nedkohome(a)atia.com> + * Copyright (C) 2000-2005 Nedko Arnaudov <nedko(a)users.sourceforge.net> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by _____ Modified: trunk/rosapps/sysutils/regexpl/ShellCommandValue.cpp --- trunk/rosapps/sysutils/regexpl/ShellCommandValue.cpp 2005-01-04 21:36:26 UTC (rev 12802) +++ trunk/rosapps/sysutils/regexpl/ShellCommandValue.cpp 2005-01-04 21:40:25 UTC (rev 12803) @@ -1,8 +1,8 @@ -/* $Id: ShellCommandValue.cpp,v 1.5 2004/10/11 01:24:22 sedwards Exp $ +/* $Id$ * * regexpl - Console Registry Explorer * - * Copyright (C) 2000,2001 Nedko Arnaoudov <nedkohome(a)atia.com> + * Copyright (C) 2000-2005 Nedko Arnaudov <nedko(a)users.sourceforge.net> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by _____ Modified: trunk/rosapps/sysutils/regexpl/ShellCommandVersion.cpp --- trunk/rosapps/sysutils/regexpl/ShellCommandVersion.cpp 2005-01-04 21:36:26 UTC (rev 12802) +++ trunk/rosapps/sysutils/regexpl/ShellCommandVersion.cpp 2005-01-04 21:40:25 UTC (rev 12803) @@ -1,8 +1,8 @@ -/* $Id: ShellCommandVersion.cpp,v 1.3 2001/01/13 23:55:37 narnaoud Exp $ +/* $Id$ * * regexpl - Console Registry Explorer * - * Copyright (C) 2000,2001 Nedko Arnaoudov <nedkohome(a)atia.com> + * Copyright (C) 2000-2005 Nedko Arnaudov <nedko(a)users.sourceforge.net> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by _____ Modified: trunk/rosapps/sysutils/regexpl/ShellCommandsLinkedList.cpp --- trunk/rosapps/sysutils/regexpl/ShellCommandsLinkedList.cpp 2005-01-04 21:36:26 UTC (rev 12802) +++ trunk/rosapps/sysutils/regexpl/ShellCommandsLinkedList.cpp 2005-01-04 21:40:25 UTC (rev 12803) @@ -1,8 +1,8 @@ -/* $Id: ShellCommandsLinkedList.cpp,v 1.3 2001/01/13 23:55:37 narnaoud Exp $ +/* $Id$ * * regexpl - Console Registry Explorer * - * Copyright (C) 2000,2001 Nedko Arnaoudov <nedkohome(a)atia.com> + * Copyright (C) 2000-2005 Nedko Arnaudov <nedko(a)users.sourceforge.net> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by _____ Modified: trunk/rosapps/sysutils/regexpl/TextHistory.cpp --- trunk/rosapps/sysutils/regexpl/TextHistory.cpp 2005-01-04 21:36:26 UTC (rev 12802) +++ trunk/rosapps/sysutils/regexpl/TextHistory.cpp 2005-01-04 21:40:25 UTC (rev 12803) @@ -1,8 +1,8 @@ -/* $Id: TextHistory.cpp,v 1.3 2001/01/13 23:55:37 narnaoud Exp $ +/* $Id$ * * regexpl - Console Registry Explorer * - * Copyright (C) 2000,2001 Nedko Arnaoudov <nedkohome(a)atia.com> + * Copyright (C) 2000-2005 Nedko Arnaudov <nedko(a)users.sourceforge.net> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by _____ Modified: trunk/rosapps/sysutils/regexpl/regexpl.rc --- trunk/rosapps/sysutils/regexpl/regexpl.rc 2005-01-04 21:36:26 UTC (rev 12802) +++ trunk/rosapps/sysutils/regexpl/regexpl.rc 2005-01-04 21:40:25 UTC (rev 12803) @@ -1,7 +1,7 @@ -/* $Id: regexpl.rc,v 1.5 2004/10/16 22:30:19 gvg Exp $ */ +/* $Id$ */ #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Console Registry Explorer\0" #define REACTOS_STR_INTERNAL_NAME "regexpl\0" #define REACTOS_STR_ORIGINAL_FILENAME "regexpl.exe\0" -#define REACTOS_STR_ORIGINAL_COPYRIGHT "2000 (c) Nedko Arnaoudov\0" +#define REACTOS_STR_ORIGINAL_COPYRIGHT "2000 (c) Nedko Arnaudov\0" #include <reactos/version.rc>

1 0

[narnaoud] 12802: Fix personal info.
by narnaoud＠svn.reactos.com 04 Jan '05

04 Jan '05

Fix personal info. Replace tabs with spaces. Modified: trunk/rosapps/sysutils/regexpl/RegistryExplorer.h _____ Modified: trunk/rosapps/sysutils/regexpl/RegistryExplorer.h --- trunk/rosapps/sysutils/regexpl/RegistryExplorer.h 2005-01-04 21:29:09 UTC (rev 12801) +++ trunk/rosapps/sysutils/regexpl/RegistryExplorer.h 2005-01-04 21:36:26 UTC (rev 12802) @@ -1,51 +1,46 @@ -/* $Id: RegistryExplorer.h,v 1.8 2003/02/09 02:15:23 narnaoud Exp $ */ +/* $Id$ */ #ifndef _REGISTRY_EXPLORER_H__INCLUDED #define _REGISTRY_EXPLORER_H__INCLUDED -#define CURRENT_VERSION _T("0.20+") -#define EMAIL _T("registryexplorer(a)yahoo.com") +#define CURRENT_VERSION _T("0.20+") +#define EMAIL _T("nedko(a)users.sourceforge.net") //#define __L(x) L ## x //#define _L(x) __L(x) -/* -#define HELLO_MSG(date) _T("Registry Explorer for Microsoft Windows NT 4.0\n")\ - _T("Version ") CURRENT_VERSION _T(" Compiled on ") date _T("\n")\ - _T("Coded by Nedko Arnaoudov. This product is freeware.\n\n") -*/ -#define PRODUCT_NAME _T("Registry Explorer") +#define PRODUCT_NAME _T("Registry Explorer") -#define HELLO_MSG _T("ReactOS ") PRODUCT_NAME _T(" version ") CURRENT_VERSION _T("\n")\ - _T("License is GNU GPL. Type `help gpl` for details.\n\n") +#define HELLO_MSG _T("ReactOS ") PRODUCT_NAME _T(" version ") CURRENT_VERSION _T("\n")\ + _T("License is GNU GPL. Type `help gpl` for details.\n\n") -#define NOWARANTY_MSG _T("Registry Explorer comes with ABSOLUTELY NO WARRANTY\n")\ - _T("This is free software, and you are welcome to redistribute it\n")\ - _T("under certain conditions; type `help gpl' for details.\n") +#define NOWARANTY_MSG _T("Registry Explorer comes with ABSOLUTELY NO WARRANTY\n")\ + _T("This is free software, and you are welcome to redistribute it\n")\ + _T("under certain conditions; type `help gpl' for details.\n") -#define COPYRIGHT_MSG _T("Copyright (C) 2000-2001 Nedko Arnaoudov\n") +#define COPYRIGHT_MSG _T("Copyright (C) 2000-2005 Nedko Arnaudov\n") -#define CREDITS_MSG _T("Registry Explorer is written by Nedko Arnaoudov\n")\ - _T("Special thanks to Emanuele Aliberti\n") +#define CREDITS_MSG _T("Registry Explorer is written by Nedko Arnaudov\n")\ + _T("Special thanks to ReactOS team.\n") -#define BUGS_MSG _T("Please report bugs to ") EMAIL _T("\n") +#define BUGS_MSG _T("Please report bugs to ") EMAIL _T("\n") -#define VER_MSG COPYRIGHT_MSG\ - _T("\n")\ - NOWARANTY_MSG\ - _T("\n")\ - CREDITS_MSG\ - _T("\n")\ - BUGS_MSG +#define VER_MSG COPYRIGHT_MSG\ + _T("\n")\ + NOWARANTY_MSG\ + _T("\n")\ + CREDITS_MSG\ + _T("\n")\ + BUGS_MSG -#define GOODBYE_MSG _T("\nThank you for using Registry Explorer !!!\n") +#define GOODBYE_MSG _T("\nThank you for using Registry Explorer !!!\n") -//#define COMMAND_LENGTH(cmd) (sizeof(DIR_CMD)-sizeof(TCHAR))/sizeof(TCHAR) -#define COMMAND_LENGTH(cmd) _tcslen(cmd) +//#define COMMAND_LENGTH(cmd) (sizeof(DIR_CMD)-sizeof(TCHAR))/sizeof(TCHAR) +#define COMMAND_LENGTH(cmd) _tcslen(cmd) -#define PROMPT_BUFFER_SIZE 1024 +#define PROMPT_BUFFER_SIZE 1024 -#define COMMAND_NA_ON_ROOT _T(" is not applicable to root key.\n") +#define COMMAND_NA_ON_ROOT _T(" is not applicable to root key.\n") #define SETTINGS_REGISTRY_KEY _T("Software\\Registry Explorer\\") #define NORMAL_TEXT_ATTRIBUTES_VALUE_NAME _T("Normal Text Color")

1 0

[chorns] 12801: Add project and module tests.
by chorns＠svn.reactos.com 04 Jan '05

04 Jan '05

Add project and module tests. Modified: branches/xmlbuildsystem/reactos/tools/rbuild/makefile Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/test.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/alltests.cpp Added: branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/ Added: branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/module.xml Added: branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/project.xml Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/moduletest.cpp Added: branches/xmlbuildsystem/reactos/tools/rbuild/tests/projecttest.cpp _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/makefile --- branches/xmlbuildsystem/reactos/tools/rbuild/makefile 2005-01-04 21:25:20 UTC (rev 12800) +++ branches/xmlbuildsystem/reactos/tools/rbuild/makefile 2005-01-04 21:29:09 UTC (rev 12801) @@ -13,7 +13,9 @@ OBJECTS = $(BASE_OBJECTS) rbuild.o -TESTS = tests/moduletest.o +TESTS = \ + tests/moduletest.o \ + tests/projecttest.o TEST_OBJECTS = $(BASE_OBJECTS) $(TESTS) tests/alltests.o _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp 2005-01-04 21:25:20 UTC (rev 12800) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp 2005-01-04 21:29:09 UTC (rev 12801) @@ -58,7 +58,8 @@ } catch (Exception& ex) { - printf ( ex.Message.c_str() ); + printf ( "%s\n", + ex.Message.c_str() ); return 1; } } _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/test.h --- branches/xmlbuildsystem/reactos/tools/rbuild/test.h 2005-01-04 21:25:20 UTC (rev 12800) +++ branches/xmlbuildsystem/reactos/tools/rbuild/test.h 2005-01-04 21:29:09 UTC (rev 12801) @@ -14,18 +14,26 @@ void Assert(const char *message, ...); void IsTrue(bool condition, const char* file, - int line ); + int line); void IsFalse(bool condition, const char* file, - int line ); + int line); void AreEqual(int expected, int actual, const char* file, - int line ); + int line); + void AreEqual(string expected, + string actual, + const char* file, + int line); + void AreEqual(const char* expected, + string actual, + const char* file, + int line); void AreNotEqual(int expected, int actual, const char* file, - int line ); + int line); private: void Fail(); }; @@ -35,6 +43,13 @@ #define ARE_EQUAL(expected,actual) AreEqual(expected,actual,__FILE__,__LINE__) #define ARE_NOT_EQUAL(expected,actual) AreNotEqual(expected,actual,__FILE__,__LINE__) +class ProjectTest : public BaseTest +{ +public: + void Run(); +}; + + class ModuleTest : public BaseTest { public: _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/alltests.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/tests/alltests.cpp 2005-01-04 21:25:20 UTC (rev 12800) +++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/alltests.cpp 2005-01-04 21:29:09 UTC (rev 12801) @@ -4,7 +4,7 @@ BaseTest::BaseTest() { - Failed = true; + Failed = false; } BaseTest::~BaseTest() @@ -61,6 +61,32 @@ } } +void BaseTest::AreEqual(string expected, + string actual, + const char* file, + int line) +{ + if (actual != expected) + { + Assert("Expected '%s' was '%s' at %s:%d\n", + expected.c_str(), + actual.c_str(), + file, + line); + } +} + +void BaseTest::AreEqual(const char* expected, + string actual, + const char* file, + int line) +{ + AreEqual(string(expected), + actual, + file, + line); +} + void BaseTest::AreNotEqual(int expected, int actual, const char* file, @@ -103,10 +129,19 @@ GetTests(tests); for (size_t i = 0; i < tests.size(); i++) { - BaseTest& test = *tests[i]; - test.Run(); - if (test.Failed) + try + { + BaseTest& test = *tests[i]; + test.Run(); + if (test.Failed) + numberOfFailedTests++; + } + catch (Exception& ex) + { + printf("%s\n", + ex.Message.c_str()); numberOfFailedTests++; + } } if (numberOfFailedTests > 0) @@ -119,6 +154,7 @@ private: void GetTests ( BaseTestList& tests ) { + tests.push_back(new ProjectTest()); tests.push_back(new ModuleTest()); } }; _____ Added: branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/module.xml --- branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/module.xml 2005-01-04 21:25:20 UTC (rev 12800) +++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/module.xml 2005-01-04 21:29:09 UTC (rev 12801) @@ -0,0 +1,14 @@ +<project name="Project"> + <directory name="dir1"> + <module name="module1" type="buildtool"> + <file>file1.c</file> + <file>file2.c</file> + </module> + </directory> + <directory name="dir2"> + <module name="module2" type="buildtool"> + <file>file3.c</file> + <file>file4.c</file> + </module> + </directory> +</project> _____ Added: branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/project.xml --- branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/project.xml 2005-01-04 21:25:20 UTC (rev 12800) +++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/project.xml 2005-01-04 21:29:09 UTC (rev 12801) @@ -0,0 +1,10 @@ +<project name="Project"> + <directory name="dir1"> + <module name="module1" type="buildtool"> + </module> + </directory> + <directory name="dir2"> + <module name="module2" type="buildtool"> + </module> + </directory> +</project> _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/moduletest.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/tests/moduletest.cpp 2005-01-04 21:25:20 UTC (rev 12800) +++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/moduletest.cpp 2005-01-04 21:29:09 UTC (rev 12801) @@ -2,5 +2,17 @@ void ModuleTest::Run() { - IS_TRUE(false); + string projectFilename ( "tests/data/module.xml" ); + Project* project = new Project( projectFilename ); + ARE_EQUAL(2, project->modules.size()); + + Module& module1 = *project->modules[0]; + ARE_EQUAL(2, module1.files.size()); + ARE_EQUAL("./dir1/file1.c", module1.files[0]->name); + ARE_EQUAL("./dir1/file2.c", module1.files[1]->name); + + Module& module2 = *project->modules[1]; + ARE_EQUAL(2, module2.files.size()); + ARE_EQUAL("./dir2/file3.c", module2.files[0]->name); + ARE_EQUAL("./dir2/file4.c", module2.files[1]->name); } _____ Added: branches/xmlbuildsystem/reactos/tools/rbuild/tests/projecttest.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/tests/projecttest.cpp 2005-01-04 21:25:20 UTC (rev 12800) +++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/projecttest.cpp 2005-01-04 21:29:09 UTC (rev 12801) @@ -0,0 +1,8 @@ +#include "test.h" + +void ProjectTest::Run() +{ + string projectFilename ( "tests/data/project.xml" ); + Project* project = new Project( projectFilename ); + ARE_EQUAL(2, project->modules.size()); +}

1 0

[navaraf] 12800: Don't free the memory for LParam in NtUserPeekMessage if called with PM_NOREMOVE flag.
by navaraf＠svn.reactos.com 04 Jan '05

04 Jan '05

Don't free the memory for LParam in NtUserPeekMessage if called with PM_NOREMOVE flag. Modified: trunk/reactos/subsys/win32k/ntuser/message.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/message.c --- trunk/reactos/subsys/win32k/ntuser/message.c 2005-01-04 21:19:51 UTC (rev 12799) +++ trunk/reactos/subsys/win32k/ntuser/message.c 2005-01-04 21:25:20 UTC (rev 12800) @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: message.c,v 1.79 2004/12/29 19:55:01 gvg Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -835,7 +835,7 @@ } Info.Msg.lParam = (LPARAM) UserMem; } - if (Msg.FreeLParam && 0 != Msg.Msg.lParam) + if (RemoveMsg && Msg.FreeLParam && 0 != Msg.Msg.lParam) { ExFreePool((void *) Msg.Msg.lParam); }

1 0

[navaraf] 12799: Remove a broken header that's not needed anymore.
by navaraf＠svn.reactos.com 04 Jan '05

04 Jan '05

Remove a broken header that's not needed anymore. Deleted: trunk/reactos/include/ddk/miniport.h _____ Deleted: trunk/reactos/include/ddk/miniport.h --- trunk/reactos/include/ddk/miniport.h 2005-01-04 20:50:06 UTC (rev 12798) +++ trunk/reactos/include/ddk/miniport.h 2005-01-04 21:19:51 UTC (rev 12799) @@ -1,87 +0,0 @@ -/* - * miniport.h - * - * Type definitions for miniport drivers - * - * This file is part of the w32api package. - * - * Contributors: - * Created by Casper S. Hornstrup <chorns(a)users.sourceforge.net> - * - * THIS SOFTWARE IS NOT COPYRIGHTED - * - * This source code is offered for use in the public domain. You may - * use, modify or distribute it freely. - * - * This code is distributed in the hope that it will be useful but - * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY - * DISCLAIMED. This includes but is not limited to warranties of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - */ - -#ifndef __MINIPORT_H -#define __MINIPORT_H - -#if __GNUC__ >=3 -#pragma GCC system_header -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -#define DDKAPI - -#pragma pack(push,4) - -#include "ntddk.h" - - -#define EMULATOR_READ_ACCESS 0x01 -#define EMULATOR_WRITE_ACCESS 0x02 - -typedef enum _EMULATOR_PORT_ACCESS_TYPE { - Uchar, - Ushort, - Ulong -} EMULATOR_PORT_ACCESS_TYPE, *PEMULATOR_PORT_ACCESS_TYPE; - - -typedef struct _EMULATOR_ACCESS_ENTRY { - ULONG BasePort; - ULONG NumConsecutivePorts; - EMULATOR_PORT_ACCESS_TYPE AccessType; - UCHAR AccessMode; - UCHAR StringSupport; - PVOID Routine; -} EMULATOR_ACCESS_ENTRY, *PEMULATOR_ACCESS_ENTRY; - -#ifndef VIDEO_ACCESS_RANGE_DEFINED /* also in video.h */ -#define VIDEO_ACCESS_RANGE_DEFINED -typedef struct _VIDEO_ACCESS_RANGE { - PHYSICAL_ADDRESS RangeStart; - ULONG RangeLength; - UCHAR RangeInIoSpace; - UCHAR RangeVisible; - UCHAR RangeShareable; - UCHAR RangePassive; -} VIDEO_ACCESS_RANGE, *PVIDEO_ACCESS_RANGE; -#endif - -#ifndef BANKED_SECTION_ROUTINE_DEFINED /* also in video.h */ -#define BANKED_SECTION_ROUTINE_DEFINED -typedef VOID DDKAPI -(*PBANKED_SECTION_ROUTINE)( - IN ULONG ReadBank, - IN ULONG WriteBank, - IN PVOID Context); -#endif - -#pragma pack(pop) - -#ifdef __cplusplus -} -#endif - -#endif /* __MINIPORT_H */

1 0

[narnaoud] 12798: Use .exe postfix when building on non-windows hosts too.
by narnaoud＠svn.reactos.com 04 Jan '05

04 Jan '05

Use .exe postfix when building on non-windows hosts too. We are always building Win32 executable. Modified: trunk/rosapps/sysutils/regexpl/Makefile _____ Modified: trunk/rosapps/sysutils/regexpl/Makefile --- trunk/rosapps/sysutils/regexpl/Makefile 2005-01-04 20:37:48 UTC (rev 12797) +++ trunk/rosapps/sysutils/regexpl/Makefile 2005-01-04 20:50:06 UTC (rev 12798) @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.13 2004/12/29 00:31:45 gvg Exp $ +# $Id$ # # ReactOS makefile for RegExpl # @@ -9,7 +9,7 @@ TARGET_NAME=regexpl -all: $(TARGET_NAME)$(EXE_POSTFIX) +all: $(TARGET_NAME).exe ROS_DIR=../../../reactos ROS_INC=$(ROS_DIR)/include @@ -52,12 +52,12 @@ CLEAN_FILES = \ *.o \ - $(TARGET_NAME)$(EXE_POSTFIX) \ + $(TARGET_NAME).exe \ $(TARGET_NAME).sym -$(TARGET_NAME)$(EXE_POSTFIX): $(OBJECTS) - $(CXX) -Wl,--subsystem,console -o $(TARGET_NAME)$(EXE_POSTFIX) $(OBJECTS)$(IMPORT_KERNEL32) $(IMPORT_USER32) - $(NM) --numeric-sort $(TARGET_NAME)$(EXE_POSTFIX) > $(TARGET_NAME).sym +$(TARGET_NAME).exe: $(OBJECTS) + $(CXX) -Wl,--subsystem,console -o $(TARGET_NAME).exe $(OBJECTS)$(IMPORT_KERNEL32) $(IMPORT_USER32) + $(NM) --numeric-sort $(TARGET_NAME).exe > $(TARGET_NAME).sym clean: $(CLEAN_FILES:%=%_clean)

1 0

[chorns] 12797: Exception handling.
by chorns＠svn.reactos.com 04 Jan '05

04 Jan '05

Exception handling. Added: branches/xmlbuildsystem/reactos/tools/rbuild/exception.cpp Added: branches/xmlbuildsystem/reactos/tools/rbuild/exception.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/makefile Modified: branches/xmlbuildsystem/reactos/tools/rbuild/project.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h _____ Added: branches/xmlbuildsystem/reactos/tools/rbuild/exception.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/exception.cpp 2005-01-04 20:10:11 UTC (rev 12796) +++ branches/xmlbuildsystem/reactos/tools/rbuild/exception.cpp 2005-01-04 20:37:48 UTC (rev 12797) @@ -0,0 +1,50 @@ +#ifdef _MSC_VER +#pragma warning ( disable : 4786 ) // identifier was truncated to '255' characters in the debug information +#endif//_MSC_VER + +#include <stdarg.h> +#include "rbuild.h" + +Exception::Exception() +{ +} + +Exception::Exception(string message) +{ + Message = message; +} + +Exception::Exception(const char* format, + ...) +{ + va_list args; + va_start(args, + format); + Message = ssvprintf(format, + args); + va_end(args); +} + +void Exception::SetMessage(const char* message, + va_list args) +{ + Message = ssvprintf(message, + args); +} + + +FileNotFoundException::FileNotFoundException(string filename) + : Exception ( "File '%s' not found.", filename.c_str() ) +{ + Filename = filename; +} + + +InvalidBuildFileException::InvalidBuildFileException(const char* message, + ...) +{ + va_list args; + va_start( args, message); + SetMessage(message, args); + va_end(args); +} _____ Added: branches/xmlbuildsystem/reactos/tools/rbuild/exception.h --- branches/xmlbuildsystem/reactos/tools/rbuild/exception.h 2005-01-04 20:10:11 UTC (rev 12796) +++ branches/xmlbuildsystem/reactos/tools/rbuild/exception.h 2005-01-04 20:37:48 UTC (rev 12797) @@ -0,0 +1,37 @@ +#ifndef __EXCEPTION_H +#define __EXCEPTION_H + +#include <string> + +using std::string; + +class Exception +{ +public: + Exception(string message); + Exception(const char* format, + ...); + string Message; +protected: + Exception(); + void SetMessage(const char* message, + va_list args); +}; + + +class FileNotFoundException : public Exception +{ +public: + FileNotFoundException(string filename); + string Filename; +}; + + +class InvalidBuildFileException : public Exception +{ +public: + InvalidBuildFileException(const char* message, + ...); +}; + +#endif /* __EXCEPTION_H */ _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/makefile --- branches/xmlbuildsystem/reactos/tools/rbuild/makefile 2005-01-04 20:10:11 UTC (rev 12796) +++ branches/xmlbuildsystem/reactos/tools/rbuild/makefile 2005-01-04 20:37:48 UTC (rev 12797) @@ -4,7 +4,12 @@ all: $(TARGET) -BASE_OBJECTS = xml.o project.o module.o +BASE_OBJECTS = \ + exception.o \ + module.o \ + project.o \ + ssprintf.o \ + xml.o OBJECTS = $(BASE_OBJECTS) rbuild.o _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/project.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/project.cpp 2005-01-04 20:10:11 UTC (rev 12796) +++ branches/xmlbuildsystem/reactos/tools/rbuild/project.cpp 2005-01-04 20:37:48 UTC (rev 12797) @@ -7,12 +7,44 @@ using std::string; using std::vector; +Project::Project(string filename) +{ + if ( !xmlfile.open ( filename ) ) + throw FileNotFoundException ( filename ); + ReadXml(); +} + Project::~Project() { for ( size_t i = 0; i < modules.size(); i++ ) delete modules[i]; } +void Project::ReadXml() +{ + Path path; + bool projectFound = false; + do + { + XMLElement* head = XMLParse ( xmlfile, path ); + if ( !head ) + throw InvalidBuildFileException ( "Document contains no 'project' tag." ); + + if ( head->name == "!--" ) + continue; // ignore comments + + if ( head->name != "project" ) + { + throw InvalidBuildFileException ( "Expected 'project', got '%s'.", + head->name.c_str()); + } + + this->ProcessXML ( *head, "." ); + delete head; + projectFound = true; + } while (!projectFound); +} + void Project::ProcessXML ( const XMLElement& e, const string& path ) { _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp 2005-01-04 20:10:11 UTC (rev 12796) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp 2005-01-04 20:37:48 UTC (rev 12797) @@ -17,40 +17,17 @@ { InitWorkingDirectory(); - XMLFile f; - Path path; - string xml_file ( "ReactOS.xml" ); - if ( !f.open ( xml_file ) ) + try { - printf ( "couldn't open ReactOS.xml!\n" ); - return -1; - } + string projectFilename ( "ReactOS.xml" ); + Project* project = new Project( projectFilename ); - vector<string> xml_dependencies; - xml_dependencies.push_back ( xml_file ); - for ( ;; ) - { - XMLElement* head = XMLParse ( f, path ); - if ( !head ) - break; // end of file - - if ( head->name == "!--" ) - continue; // ignore comments - - if ( head->name != "project" ) - { - printf ( "error: expecting 'project', got '%s'\n", head->name.c_str() ); - continue; - } - - Project* proj = new Project; - proj->ProcessXML ( *head, "." ); - + Path path; // REM TODO FIXME actually do something with Project object... - printf ( "Found %d modules:\n", proj->modules.size() ); - for ( size_t i = 0; i < proj->modules.size(); i++ ) + printf ( "Found %d modules:\n", project->modules.size() ); + for ( size_t i = 0; i < project->modules.size(); i++ ) { - Module& m = *proj->modules[i]; + Module& m = *project->modules[i]; printf ( "\t%s in folder: %s\n", m.name.c_str(), m.path.c_str() ); @@ -74,10 +51,14 @@ printf ( "\t\t%s\n", m.files[j]->name.c_str() ); } } + + delete project; - delete proj; - delete head; + return 0; } - - return 0; + catch (Exception& ex) + { + printf ( ex.Message.c_str() ); + return 1; + } } _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-01-04 20:10:11 UTC (rev 12796) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-01-04 20:37:48 UTC (rev 12797) @@ -1,10 +1,11 @@ #ifndef __RBUILD_H #define __RBUILD_H -#include "XML.h" - #include <string> #include <vector> +#include "ssprintf.h" +#include "exception.h" +#include "XML.h" class Project; class Module; @@ -16,8 +17,12 @@ std::string name; std::vector<Module*> modules; - ~Project(); + Project ( string filename ); + ~Project (); void ProcessXML ( const XMLElement& e, const std::string& path ); +private: + void ReadXml (); + XMLFile xmlfile; }; class Module

1 0

[ekohl] 12796: Implement RtlCutoverTimeToSystemTime().
by ekohl＠svn.reactos.com 04 Jan '05

04 Jan '05

Implement RtlCutoverTimeToSystemTime(). Modified: trunk/reactos/include/ntos/rtl.h Modified: trunk/reactos/lib/ntdll/def/ntdll.def Modified: trunk/reactos/lib/rtl/time.c _____ Modified: trunk/reactos/include/ntos/rtl.h --- trunk/reactos/include/ntos/rtl.h 2005-01-04 19:06:48 UTC (rev 12795) +++ trunk/reactos/include/ntos/rtl.h 2005-01-04 20:10:11 UTC (rev 12796) @@ -878,6 +878,12 @@ ULONG CustomSize ); +BOOLEAN STDCALL +RtlCutoverTimeToSystemTime(IN PTIME_FIELDS CutoverTimeFields, + OUT PLARGE_INTEGER SystemTime, + IN PLARGE_INTEGER CurrentTime, + IN ULONG Unknown); + NTSTATUS STDCALL RtlDecompressBuffer(IN USHORT CompressionFormat, OUT PUCHAR UncompressedBuffer, _____ Modified: trunk/reactos/lib/ntdll/def/ntdll.def --- trunk/reactos/lib/ntdll/def/ntdll.def 2005-01-04 19:06:48 UTC (rev 12795) +++ trunk/reactos/lib/ntdll/def/ntdll.def 2005-01-04 20:10:11 UTC (rev 12796) @@ -1,4 +1,4 @@ -; $Id: ntdll.def,v 1.135 2004/12/05 21:16:01 navaraf Exp $ +; $Id$ ; ; ReactOS Operating System ; @@ -370,7 +370,7 @@ ;RtlCreateUserSecurityObject RtlCreateUserThread@40 RtlCustomCPToUnicodeN@24 -;RtlCutoverTimeToSystemTime +RtlCutoverTimeToSystemTime@16 RtlDeNormalizeProcessParams@4 RtlDecompressBuffer@24 RtlDecompressFragment@32 _____ Modified: trunk/reactos/lib/rtl/time.c --- trunk/reactos/lib/rtl/time.c 2005-01-04 19:06:48 UTC (rev 12795) +++ trunk/reactos/lib/rtl/time.c 2005-01-04 20:10:11 UTC (rev 12796) @@ -1,4 +1,4 @@ -/* $Id: time.c,v 1.2 2004/12/16 23:46:41 ekohl Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -48,9 +48,7 @@ }; static const int MonthLengths[2][MONSPERYEAR] = { - { - 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 - }, + { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }, { 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 } }; @@ -72,11 +70,94 @@ /* * @implemented */ +BOOLEAN STDCALL +RtlCutoverTimeToSystemTime(IN PTIME_FIELDS CutoverTimeFields, + OUT PLARGE_INTEGER SystemTime, + IN PLARGE_INTEGER CurrentTime, + IN ULONG Unknown) +{ + TIME_FIELDS AdjustedTimeFields; + TIME_FIELDS CurrentTimeFields; + TIME_FIELDS CutoverSystemTimeFields; + LARGE_INTEGER CutoverSystemTime; + CSHORT MonthLength; + CSHORT Days; + + /* Check fixed cutover time */ + if (CutoverTimeFields->Year != 0) + { + if (!RtlTimeFieldsToTime(CutoverTimeFields, SystemTime)) + return FALSE; + + if (SystemTime->QuadPart < CurrentTime->QuadPart) + return FALSE; + + return TRUE; + } + + /* + * Compute recurring cutover time + */ + + /* Day must be between 1(first) and 5(last) */ + if (CutoverTimeFields->Day == 0 || CutoverTimeFields->Day > 5) + return FALSE; + + RtlTimeToTimeFields(CurrentTime, &CurrentTimeFields); + + /* Compute the cutover time of the first day of the current month */ + AdjustedTimeFields.Year = CurrentTimeFields.Year; + AdjustedTimeFields.Month = CutoverTimeFields->Month; + AdjustedTimeFields.Day = 1; + AdjustedTimeFields.Hour = CutoverTimeFields->Hour; + AdjustedTimeFields.Minute = CutoverTimeFields->Minute; + AdjustedTimeFields.Second = CutoverTimeFields->Second; + AdjustedTimeFields.Milliseconds = CutoverTimeFields->Milliseconds; + + if (!RtlTimeFieldsToTime(&AdjustedTimeFields, &CutoverSystemTime)) + return FALSE; + + RtlTimeToTimeFields(&CutoverSystemTime, &CutoverSystemTimeFields); + + /* Adjust day to first matching weekday */ + if (CutoverSystemTimeFields.Weekday != CutoverTimeFields->Weekday) + { + if (CutoverSystemTimeFields.Weekday < CutoverTimeFields->Weekday) + Days = CutoverTimeFields->Weekday - CutoverSystemTimeFields.Weekday; + else + Days = DAYSPERWEEK - (CutoverSystemTimeFields.Weekday - CutoverTimeFields->Weekday); + + AdjustedTimeFields.Day += Days; + } + + /* Adjust the number of weeks */ + if (CutoverTimeFields->Day > 1) + { + Days = DAYSPERWEEK * (CutoverTimeFields->Day - 1); + MonthLength = MonthLengths[IsLeapYear(AdjustedTimeFields.Year)][AdjustedTimeFields.Mon th - 1]; + if ((AdjustedTimeFields.Day + Days) > MonthLength) + Days -= DAYSPERWEEK; + + AdjustedTimeFields.Day += Days; + } + + if (!RtlTimeFieldsToTime(&AdjustedTimeFields, &CutoverSystemTime)) + return FALSE; + + SystemTime->QuadPart = CutoverSystemTime.QuadPart; + + return TRUE; +} + + +/* + * @implemented + */ BOOLEAN STDCALL RtlTimeFieldsToTime( - PTIME_FIELDS TimeFields, - PLARGE_INTEGER Time) + IN PTIME_FIELDS TimeFields, + OUT PLARGE_INTEGER Time) { int CurYear; int CurMonth; @@ -179,13 +260,13 @@ /* - * @unimplemented + * @implemented */ VOID STDCALL RtlTimeToTimeFields( - PLARGE_INTEGER Time, - PTIME_FIELDS TimeFields) + IN PLARGE_INTEGER Time, + OUT PTIME_FIELDS TimeFields) { const int *Months; int SecondsInDay, CurYear; @@ -230,7 +311,6 @@ Days += CurYear - CurYear / 4 + CurYear / 100 - CurYear / 400; CurYear++; Days -= EPOCHYEAR - 1 - (EPOCHYEAR -1) / 4 + (EPOCHYEAR -1) / 100 - (EPOCHYEAR - 1) / 400; - /* FIXME: handle calendar modifications */ while (1) { LeapYear = IsLeapYear(CurYear); @@ -259,8 +339,8 @@ BOOLEAN STDCALL RtlTimeToSecondsSince1970( - PLARGE_INTEGER Time, - PULONG SecondsSince1970) + IN PLARGE_INTEGER Time, + OUT PULONG SecondsSince1970) { LARGE_INTEGER IntTime; @@ -282,8 +362,8 @@ BOOLEAN STDCALL RtlTimeToSecondsSince1980( - PLARGE_INTEGER Time, - PULONG SecondsSince1980) + IN PLARGE_INTEGER Time, + OUT PULONG SecondsSince1980) { LARGE_INTEGER IntTime; @@ -304,8 +384,8 @@ */ NTSTATUS STDCALL -RtlLocalTimeToSystemTime(PLARGE_INTEGER LocalTime, - PLARGE_INTEGER SystemTime) +RtlLocalTimeToSystemTime(IN PLARGE_INTEGER LocalTime, + OUT PLARGE_INTEGER SystemTime) { SYSTEM_TIMEOFDAY_INFORMATION TimeInformation; NTSTATUS Status; @@ -315,12 +395,12 @@ sizeof(SYSTEM_TIMEOFDAY_INFORMATION), NULL); if (!NT_SUCCESS(Status)) - return(Status); + return Status; SystemTime->QuadPart = LocalTime->QuadPart + TimeInformation.TimeZoneBias.QuadPart; - return(STATUS_SUCCESS); + return STATUS_SUCCESS; } @@ -329,8 +409,8 @@ */ NTSTATUS STDCALL -RtlSystemTimeToLocalTime(PLARGE_INTEGER SystemTime, - PLARGE_INTEGER LocalTime) +RtlSystemTimeToLocalTime(IN PLARGE_INTEGER SystemTime, + OUT PLARGE_INTEGER LocalTime) { SYSTEM_TIMEOFDAY_INFORMATION TimeInformation; NTSTATUS Status; @@ -340,36 +420,34 @@ sizeof(SYSTEM_TIMEOFDAY_INFORMATION), NULL); if (!NT_SUCCESS(Status)) - return(Status); + return Status; LocalTime->QuadPart = SystemTime->QuadPart - TimeInformation.TimeZoneBias.QuadPart; - return(STATUS_SUCCESS); + return STATUS_SUCCESS; } /* * @implemented */ -VOID -STDCALL +VOID STDCALL RtlSecondsSince1970ToTime( - ULONG SecondsSince1970, - PLARGE_INTEGER Time) + IN ULONG SecondsSince1970, + OUT PLARGE_INTEGER Time) { - Time->QuadPart = ((LONGLONG)SecondsSince1970 * TICKSPERSEC) + TICKSTO1970; + Time->QuadPart = ((LONGLONG)SecondsSince1970 * TICKSPERSEC) + TICKSTO1970; } /* * @implemented */ -VOID -STDCALL +VOID STDCALL RtlSecondsSince1980ToTime( - ULONG SecondsSince1980, - PLARGE_INTEGER Time) + IN ULONG SecondsSince1980, + OUT PLARGE_INTEGER Time) { Time->QuadPart = ((LONGLONG)SecondsSince1980 * TICKSPERSEC) + TICKSTO1980; }

1 0

[royce] 12795: fix gcc incompatibilities
by royce＠svn.reactos.com 04 Jan '05

04 Jan '05

fix gcc incompatibilities Modified: branches/xmlbuildsystem/reactos/tools/rbuild/ssprintf.cpp _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/ssprintf.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/ssprintf.cpp 2005-01-04 18:38:31 UTC (rev 12794) +++ branches/xmlbuildsystem/reactos/tools/rbuild/ssprintf.cpp 2005-01-04 19:06:48 UTC (rev 12795) @@ -1035,7 +1035,7 @@ return true; } -static int string(std::string& f, const char* s, int len, int field_width, int precision, int flags) +static int do_string(std::string& f, const char* s, int len, int field_width, int precision, int flags) { int i, done = 0; if (s == NULL) @@ -1076,7 +1076,7 @@ return done; } -static int wstring(std::wstring& f, const wchar_t* s, int len, int field_width, int precision, int flags) +static int do_wstring(std::wstring& f, const wchar_t* s, int len, int field_width, int precision, int flags) { int i, done = 0; if (s == NULL) @@ -1226,7 +1226,7 @@ long double _ldouble; double _double; const char *s; - const unsigned short* sw; + const wchar_t* sw; int result; std::string f; @@ -1370,7 +1370,7 @@ } else { /* print ascii string */ s = va_arg(args, char *); - result = string(f, s, -1, field_width, precision, flags); + result = do_string(f, s, -1, field_width, precision, flags); } if (result < 0) { @@ -1383,7 +1383,7 @@ if (qualifier == 'h') { /* print ascii string */ s = va_arg(args, char *); - result = string(f, s, -1, field_width, precision, flags); + result = do_string(f, s, -1, field_width, precision, flags); } else { /* print unicode string */ sw = va_arg(args, wchar_t *); @@ -1720,7 +1720,7 @@ } else { /* print unicode string */ s = va_arg(args, wchar_t *); - result = wstring(f, s, -1, field_width, precision, flags); + result = do_wstring(f, s, -1, field_width, precision, flags); } if (result < 0) { @@ -1733,7 +1733,7 @@ if (qualifier == L'l' || qualifier == L'w') { /* print unicode string */ s = va_arg(args, wchar_t *); - result = wstring(f, s, -1, field_width, precision, flags); + result = do_wstring(f, s, -1, field_width, precision, flags); } else { /* print ascii string */ sa = va_arg(args, char *);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs