Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 24756: - print debug logs on stdout - sysreg is now ready for deployment
by janderwald＠svn.reactos.org 14 Nov '06

14 Nov '06

Author: janderwald Date: Tue Nov 14 20:10:26 2006 New Revision: 24756 URL: http://svn.reactos.org/svn/reactos?rev=24756&view=rev Log: - print debug logs on stdout - sysreg is now ready for deployment Modified: trunk/reactos/tools/sysreg/reg_test.h trunk/reactos/tools/sysreg/rosboot_test.cpp Modified: trunk/reactos/tools/sysreg/reg_test.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/reg_test.h?re… ============================================================================== --- trunk/reactos/tools/sysreg/reg_test.h (original) +++ trunk/reactos/tools/sysreg/reg_test.h Tue Nov 14 20:10:26 2006 @@ -72,6 +72,16 @@ virtual bool execute(ConfigParser & conf_parser) = 0; +//--------------------------------------------------------------------------------------- +/// +/// checkForHang +/// +/// +/// + + + + protected: string m_Name; Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.cpp (original) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp Tue Nov 14 20:10:26 2006 @@ -173,7 +173,7 @@ { string line = debug_data[i]; - //cerr << line << endl; + cout << line << endl; if (line.find (RosBootTest::SYSREG_CHECKPOINT) != string::npos) {

1 0

[janderwald] 24755: - dump reached checkpoints when an BSOD is detected - dump rest of log file when a BSOD is detected - write debugging data to ROSBOOT_DEBUG_FILE when reading from a pipe - update configuration files - silence debug print in sym_file.cpp
by janderwald＠svn.reactos.org 14 Nov '06

14 Nov '06

Author: janderwald Date: Tue Nov 14 19:58:42 2006 New Revision: 24755 URL: http://svn.reactos.org/svn/reactos?rev=24755&view=rev Log: - dump reached checkpoints when an BSOD is detected - dump rest of log file when a BSOD is detected - write debugging data to ROSBOOT_DEBUG_FILE when reading from a pipe - update configuration files - silence debug print in sym_file.cpp Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp trunk/reactos/tools/sysreg/rosboot_test.h trunk/reactos/tools/sysreg/runonce.cfg trunk/reactos/tools/sysreg/secstage.cfg trunk/reactos/tools/sysreg/sym_file.cpp trunk/reactos/tools/sysreg/txtmode.cfg Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.cpp (original) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp Tue Nov 14 19:58:42 2006 @@ -18,6 +18,7 @@ #include <iostream> #include <vector> +#include <fstream> #include <time.h> #include <float.h> #include <stdio.h> @@ -33,6 +34,13 @@ using System_::SymbolFile; using System_::FileReader; using System_::OsSupport; + +#ifdef UNICODE + using std::wofstream; + typedef wofstream ofstream; +#else + using std::ofstream; +#endif string RosBootTest::VARIABLE_NAME = _T("ROSBOOT_CMD"); string RosBootTest::CLASS_NAME = _T("rosboot"); @@ -102,8 +110,6 @@ m_Delayread = 0; } } - - /// /// read optional arguments @@ -111,6 +117,8 @@ conf_parser.getStringValue (RosBootTest::CHECK_POINT, m_Checkpoint); conf_parser.getStringValue (RosBootTest::CRITICAL_APP, m_CriticalApp); + conf_parser.getStringValue (RosBootTest::DEBUG_FILE, m_DebugFile); + if (conf_parser.getStringValue (RosBootTest::PID_FILE, m_PidFile)) { _tremove(m_PidFile.c_str ()); @@ -122,13 +130,12 @@ } else if (!_tcscmp(debug_port.c_str(), _T("file"))) { - string debug_file; - if (!conf_parser.getStringValue (RosBootTest::DEBUG_FILE, debug_file)) + if (!m_DebugFile.length()) { cerr << "Error: ROSBOOT_DEBUG_FILE is not set in configuration file" << endl; return false; } - ret = fetchDebugByFile(boot_cmd, debug_file); + ret = fetchDebugByFile(boot_cmd); } else { @@ -137,7 +144,6 @@ return false; } - return ret; } //--------------------------------------------------------------------------------------- @@ -167,7 +173,7 @@ { string line = debug_data[i]; - cerr << line << endl; + //cerr << line << endl; if (line.find (RosBootTest::SYSREG_CHECKPOINT) != string::npos) { @@ -177,18 +183,35 @@ state = DebugStateCPReached; break; } - if (line.find (_T("|")) != string::npos) - { - string fline = debug_data[i]; - m_Checkpoints.push_back (fline); - } + m_Checkpoints.push_back (line); } if (line.find (_T("*** Fatal System Error")) != string::npos) { - cerr << "BSOD detected" <<endl; - dumpCheckpoints(); + cerr << "Blue Screen of Death detected" <<endl; + if (m_Checkpoints.size ()) + { + cerr << "dumping list of reached checkpoints:" << endl; + do + { + string cp = m_Checkpoints[0]; + m_Checkpoints.erase (m_Checkpoints.begin ()); + cerr << cp << endl; + }while(m_Checkpoints.size ()); + cerr << _T("----------------------------------") << endl; + } + if (i + 1 < debug_data.size () ) + { + cerr << "dumping rest of debug log" << endl; + while(i < debug_data.size ()) + { + string data = debug_data[i]; + cerr << data << endl; + i++; + } + cerr << _T("----------------------------------") << endl; + } state = DebugStateBSODDetected; break; } @@ -362,18 +385,37 @@ bool ret = true; vector<string> vect; size_t lines = 0; + bool write_log; + ofstream file; + if (m_DebugFile.length ()) + { + _tremove(m_DebugFile.c_str ()); + file.open (m_DebugFile.c_str ()); + } + + write_log = file.is_open (); + while(1) { if (isTimeout(m_Timeout)) { break; } + size_t prev_count = vect.size (); size_t line_count = namedpipe_reader.readPipe (vect); if (!line_count) { cerr << "No data read" << endl; continue; } + if (write_log) + { + for (size_t i = prev_count; i < vect.size (); i++) + { + string & line = vect[i]; + file << line; + } + } DebugState state = checkDebugData(vect); if (state == DebugStateBSODDetected || state == DebugStateUMEDetected) @@ -388,16 +430,20 @@ lines += line_count; } namedpipe_reader.closePipe (); + if (write_log) + { + file.close(); + } _sleep(3* CLOCKS_PER_SEC); OsSupport::terminateProcess (pid); return ret; } //--------------------------------------------------------------------------------------- - bool RosBootTest::fetchDebugByFile(string boot_cmd, string debug_log) + bool RosBootTest::fetchDebugByFile(string boot_cmd) { PipeReader pipe_reader; - _tremove(debug_log.c_str ()); + _tremove(m_DebugFile.c_str ()); if (!pipe_reader.openPipe(boot_cmd, string(_T("rt")))) { @@ -432,9 +478,9 @@ } } FileReader file; - if (!file.openFile (debug_log.c_str ())) - { - cerr << "Error: failed to open debug log " << debug_log << endl; + if (!file.openFile (m_DebugFile.c_str ())) + { + cerr << "Error: failed to open debug log " << m_DebugFile<< endl; pipe_reader.closePipe (); return false; } Modified: trunk/reactos/tools/sysreg/rosboot_test.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.h (original) +++ trunk/reactos/tools/sysreg/rosboot_test.h Tue Nov 14 19:58:42 2006 @@ -92,10 +92,9 @@ /// Note: if an error occurs, this function returns false /// /// @param BootCmd the command which is passed to PipeReader class -/// @param debug_log path pointing to debug log /// @return bool - bool fetchDebugByFile(string BootCmd, string debug_log); + bool fetchDebugByFile(string BootCmd); //--------------------------------------------------------------------------------------- /// @@ -140,6 +139,7 @@ string m_PidFile; string m_Checkpoint; string m_CriticalApp; + string m_DebugFile; vector <string> m_Checkpoints; unsigned long m_Delayread; Modified: trunk/reactos/tools/sysreg/runonce.cfg URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/runonce.cfg?r… ============================================================================== --- trunk/reactos/tools/sysreg/runonce.cfg (original) +++ trunk/reactos/tools/sysreg/runonce.cfg Tue Nov 14 19:58:42 2006 @@ -60,8 +60,8 @@ ; debug data to the specified debug file ; -;ROSBOOT_DEBUG_FILE=D:\ReactOS\tools\sysreg\bsdebug.log -;ROSBOOT_DEBUG_FILE=D:\ReactOS\tools\sysreg\debug.log +ROSBOOT_DEBUG_FILE=D:\ReactOS\tools\sysreg\runonce.log + ; ROSBOOT_DELAY_READ; ; Modified: trunk/reactos/tools/sysreg/secstage.cfg URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/secstage.cfg?… ============================================================================== --- trunk/reactos/tools/sysreg/secstage.cfg (original) +++ trunk/reactos/tools/sysreg/secstage.cfg Tue Nov 14 19:58:42 2006 @@ -60,8 +60,8 @@ ; debug data to the specified debug file ; -;ROSBOOT_DEBUG_FILE=D:\ReactOS\tools\sysreg\bsdebug.log -;ROSBOOT_DEBUG_FILE=D:\ReactOS\tools\sysreg\debug.log +ROSBOOT_DEBUG_FILE=D:\ReactOS\tools\sysreg\secstage.log + ; ROSBOOT_DELAY_READ; ; Modified: trunk/reactos/tools/sysreg/sym_file.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sym_file.cpp?… ============================================================================== --- trunk/reactos/tools/sysreg/sym_file.cpp (original) +++ trunk/reactos/tools/sysreg/sym_file.cpp Tue Nov 14 19:58:42 2006 @@ -97,8 +97,9 @@ string path = current_dir; path.insert (path.length () -1, _T("\\")); path.insert (path.length () -1, filename); - +#ifdef NDEBUG cerr << "Module Name " << modulename << endl << "File Name " << path << endl; +#endif m_Map.insert(std::make_pair<string, string>(modulename, path)); Modified: trunk/reactos/tools/sysreg/txtmode.cfg URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/txtmode.cfg?r… ============================================================================== --- trunk/reactos/tools/sysreg/txtmode.cfg (original) +++ trunk/reactos/tools/sysreg/txtmode.cfg Tue Nov 14 19:58:42 2006 @@ -60,8 +60,7 @@ ; debug data to the specified debug file ; -;ROSBOOT_DEBUG_FILE=D:\ReactOS\tools\sysreg\bsdebug.log -;ROSBOOT_DEBUG_FILE=D:\ReactOS\tools\sysreg\debug.log +ROSBOOT_DEBUG_FILE=D:\ReactOS\tools\sysreg\txtmode.log ; ROSBOOT_DELAY_READ; ;

1 0

[janderwald] 24754: - update testboot script
by janderwald＠svn.reactos.org 14 Nov '06

14 Nov '06

Author: janderwald Date: Tue Nov 14 19:51:32 2006 New Revision: 24754 URL: http://svn.reactos.org/svn/reactos?rev=24754&view=rev Log: - update testboot script Modified: trunk/reactos/boot/bootdata/bootcdregtest/testboot.bat.sample Modified: trunk/reactos/boot/bootdata/bootcdregtest/testboot.bat.sample URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootcdregtes… ============================================================================== --- trunk/reactos/boot/bootdata/bootcdregtest/testboot.bat.sample (original) +++ trunk/reactos/boot/bootdata/bootcdregtest/testboot.bat.sample Tue Nov 14 19:51:32 2006 @@ -19,7 +19,7 @@ ECHO ECHO Informing Sysreg that we are done ECHO -start /WAIT dbgprint.exe SYSREG_CHECKPOINT:THIRDBOOT_COMPLETE +START C:\ReactOS\bin\dbgprint.exe SYSREG_CHECKPOINT:THIRDBOOT_COMPLETE ECHO ECHO Shutting down ReactOS

1 0

[greatlrd] 24753: fixing Usurp bug repot in irc channel, if a screensaver does not exists it try execute a no exiting screensaver it make reactos freze on real hw and in qemu, acoring Usurp. With this change it does not longer freze and does not either try execute a no existing screensaver. Thx Usurp for testing it.
by greatlrd＠svn.reactos.org 14 Nov '06

14 Nov '06

Author: greatlrd Date: Tue Nov 14 19:50:47 2006 New Revision: 24753 URL: http://svn.reactos.org/svn/reactos?rev=24753&view=rev Log: fixing Usurp bug repot in irc channel, if a screensaver does not exists it try execute a no exiting screensaver it make reactos freze on real hw and in qemu, acoring Usurp. With this change it does not longer freze and does not either try execute a no existing screensaver. Thx Usurp for testing it. Modified: trunk/reactos/base/system/winlogon/screensaver.c Modified: trunk/reactos/base/system/winlogon/screensaver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/scree… ============================================================================== --- trunk/reactos/base/system/winlogon/screensaver.c (original) +++ trunk/reactos/base/system/winlogon/screensaver.c Tue Nov 14 19:50:47 2006 @@ -272,6 +272,9 @@ &bufferSize); if (rc != ERROR_SUCCESS || dwType != REG_SZ) goto cleanup; + + if (bufferSize <=4) + goto cleanup; wsprintfW(szCommandLine, L"%s /s", szApplicationName); TRACE("WL: Executing %S\n", szCommandLine);

1 0

[janderwald] 24752: - ignore failure if dir already exists
by janderwald＠svn.reactos.org 14 Nov '06

14 Nov '06

Author: janderwald Date: Tue Nov 14 19:26:15 2006 New Revision: 24752 URL: http://svn.reactos.org/svn/reactos?rev=24752&view=rev Log: - ignore failure if dir already exists Modified: trunk/reactos/Makefile Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=24752&r1=2475… ============================================================================== --- trunk/reactos/Makefile (original) +++ trunk/reactos/Makefile Tue Nov 14 19:26:15 2006 @@ -403,7 +403,7 @@ world sysregtest: - mkdir $(OUTPUT_)cd$(SEP)reactos + -mkdir $(OUTPUT_)cd$(SEP)reactos $(cp) boot$(SEP)bootdata$(SEP)unattend.inf.sample boot$(SEP)bootdata$(SEP)unattend.inf $(cp) boot$(SEP)bootdata$(SEP)unattend.inf.sample $(OUTPUT_)cd$(SEP)reactos$(SEP)unattend.inf $(cp) boot$(SEP)bootdata$(SEP)bootcdregtest$(SEP)testboot.bat.sample boot$(SEP)bootdata$(SEP)bootcdregtest$(SEP)testboot.bat

1 0

[janderwald] 24751: - update svn properties - improve error checking - return -2 when the test fails - add a few test configs (required for sysregtest target)
by janderwald＠svn.reactos.org 14 Nov '06

14 Nov '06

Author: janderwald Date: Tue Nov 14 15:58:52 2006 New Revision: 24751 URL: http://svn.reactos.org/svn/reactos?rev=24751&view=rev Log: - update svn properties - improve error checking - return -2 when the test fails - add a few test configs (required for sysregtest target) Added: trunk/reactos/tools/sysreg/runonce.cfg trunk/reactos/tools/sysreg/secstage.cfg trunk/reactos/tools/sysreg/txtmode.cfg (with props) Modified: trunk/reactos/tools/sysreg/ (props changed) trunk/reactos/tools/sysreg/rosboot_test.cpp trunk/reactos/tools/sysreg/sysreg.cpp Propchange: trunk/reactos/tools/sysreg/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Tue Nov 14 15:58:52 2006 @@ -1,8 +1,10 @@ +cdmake *.coff +*.d *.exe -*.d -*.a *.o *.sym -*.map -*.tmp +*.dsp +*.dsw +*.ncb +*.opt Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.cpp (original) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp Tue Nov 14 15:58:52 2006 @@ -325,15 +325,21 @@ OsSupport::ProcessID pid = OsSupport::createProcess ((TCHAR*)boot_cmd.c_str (), 0, NULL); string::size_type pipe_pos = boot_cmd.find (_T("serial pipe:")); - pipe_pos += 12; - string::size_type pipe_pos_end = boot_cmd.find (_T(" "), pipe_pos); - if (pipe_pos != string::npos && pipe_pos > 0 && pipe_pos < boot_cmd.size()) - { - pipecmd = _T("\\\\.\\pipe\\") + boot_cmd.substr (pipe_pos, pipe_pos_end - pipe_pos); - } - else - { - return false; + + if (pipe_pos != string::npos) + { + pipe_pos += 12; + string::size_type pipe_pos_end = boot_cmd.find (_T(" "), pipe_pos); + if (pipe_pos != string::npos && pipe_pos > 0 && pipe_pos < boot_cmd.size()) + { + pipecmd = _T("\\\\.\\pipe\\") + boot_cmd.substr (pipe_pos, pipe_pos_end - pipe_pos); + } + } + + if (!pipecmd.length ()) + { + //FIXME + pipecmd = _T("\\\\.\\pipe\\vmwaredebug"); } if (m_Delayread) @@ -355,27 +361,31 @@ bool ret = true; vector<string> vect; - + size_t lines = 0; while(1) { if (isTimeout(m_Timeout)) { break; } - - if (namedpipe_reader.readPipe (vect) != 0) - { - DebugState state = checkDebugData(vect); - if (state == DebugStateBSODDetected || state == DebugStateUMEDetected) - { - ret = false; - break; - } - else if (state == DebugStateCPReached) - { - break; - } - } + size_t line_count = namedpipe_reader.readPipe (vect); + if (!line_count) + { + cerr << "No data read" << endl; + continue; + } + + DebugState state = checkDebugData(vect); + if (state == DebugStateBSODDetected || state == DebugStateUMEDetected) + { + ret = false; + break; + } + else if (state == DebugStateCPReached) + { + break; + } + lines += line_count; } namedpipe_reader.closePipe (); _sleep(3* CLOCKS_PER_SEC); Added: trunk/reactos/tools/sysreg/runonce.cfg URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/runonce.cfg?r… ============================================================================== --- trunk/reactos/tools/sysreg/runonce.cfg (added) +++ trunk/reactos/tools/sysreg/runonce.cfg Tue Nov 14 15:58:52 2006 @@ -1,0 +1,117 @@ + ; ROS_OUTPUT +; +; This variable sets the location where to search symbol files for modules +; This is required when tracing usermode exceptions, bsod etc... +; +; If this value is not defined, sysreg looks for the environment variable +; ROS_OUTPUT. If this is also not set, it uses the default output-i386 + +ROS_OUTPUT=D:\reactos\output-i386 + +; ROS_ADDR2LINE +; +; This value is used by the symbol resolver to convert an module address into +; an source file + line number; +; +; Note: The symbol resolver appends the modulename and the module address seperated by an space + +ROS_ADDR2LINE=addr2line.exe --exe= + +;----------------------------------------------------------------------------------------- +; RosBoot specific settings +; + +; +; ROSBOOT_CMD +; +; This value is the command which is executed to gain debugging data +; this value is mandatory + +ROSBOOT_CMD=D:\reactos\qemu\qemu.exe -serial pipe:qemu -boot c -m 128 -L D:\reactos\qemu\ D:\reactos\RosVM.vmdk -pidfile pid.txt + +; +; ROSBOOT_PIDFILE +; +; This option stores the pid of the emulator process in a text file. +; + +ROSBOOT_PID_FILE=pid.txt + +; +; ROSBOOT_DEBUG_PORT +; +; This variable controls on where to look for debugging data. If the +; value is set to file, then sysreg will execute ROSBOOT_CMD and also +; open the file specified in ROSBOOT_DEBUG_FILE and read the debugging info from the file +; +; If the value is set to pipe, then sysreg will read from pipe created by the +; ROSBOOT_CMD +; +;ROSBOOT_DEBUG_PORT=file +ROSBOOT_DEBUG_PORT=pipe + +; +; ROSBOOT_DEBUG_FILE +; +; This value specifies the debug file. This variable must be set when using +; ROSBOOT_DEBUG_PORT=file +; +; Note: when ROSBOOT_DEBUG_PORT is set to pipe, then sysreg will write all received +; debug data to the specified debug file +; + +;ROSBOOT_DEBUG_FILE=D:\ReactOS\tools\sysreg\bsdebug.log +;ROSBOOT_DEBUG_FILE=D:\ReactOS\tools\sysreg\debug.log + +; ROSBOOT_DELAY_READ; +; +; When the emulator is started, it spends a little time loading and running through its +; BIOS. This time delays reading from the pipe/file untill the specified value +; +; the value is in seconds +; +; Note: if the value is not provided, then reading debug info is started immediately + +ROSBOOT_DELAY_READ=4 + + + +; ROSBOOT_TIME_OUT +; +; This variable is the maximum runtime of the ROSBOOT_CMD. If the command +; runs longer than this value, sysreg exits with success mode; +; +; Note: if you set the variable ROSBOOT_CHECK_POINT and the checkpoint is not reached +; within this time, sysreg exits with failure mode +; +; If the variable is not set, the default timeout is 1 minute +; +ROSBOOT_TIME_OUT=180.0 + +; ROSBOOT_CHECK_POINT +; +; RosBoot will stop executing when it finds a string in the form +; SYSREG_CHECKPOINT:CP_NAME +; +; CP_NAME is the value of the ROSBOOT_CHECK_POINT variable + +ROSBOOT_CHECK_POINT=THIRDBOOT_COMPLETE + +; ROSBOOT_CRITICAL_APP +; +; If an user-mode exception occurs in an critical application, i.e. setup.exe / explorer.exe, sysreg will report +; that the test has failed and quit debugging immediately +; +; if an user-mode exception occurs in any other application, sysreg will report the exception but the exception +; has no effect on the test result +; +; Note: if the value is set to IGNORE, sysreg will ignore all user-mode exceptions +; +; Note: if the variable is not set, then sysreg will stop on the first user-mode exception +; +; seperate each application with an space + + +ROSBOOT_CRITICAL_APP=setup.exe userinit.exe smss.exe winlogon.exe csrss.exe explorer.exe +;ROSBOOT_CRITICAL_APP=setup.exe userinit.exe smss.exe winlogon.exe csrss.exe explorer.exe lsass.exe + Added: trunk/reactos/tools/sysreg/secstage.cfg URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/secstage.cfg?… ============================================================================== --- trunk/reactos/tools/sysreg/secstage.cfg (added) +++ trunk/reactos/tools/sysreg/secstage.cfg Tue Nov 14 15:58:52 2006 @@ -1,0 +1,118 @@ + ; ROS_OUTPUT +; +; This variable sets the location where to search symbol files for modules +; This is required when tracing usermode exceptions, bsod etc... +; +; If this value is not defined, sysreg looks for the environment variable +; ROS_OUTPUT. If this is also not set, it uses the default output-i386 + +ROS_OUTPUT=D:\reactos\output-i386 + +; ROS_ADDR2LINE +; +; This value is used by the symbol resolver to convert an module address into +; an source file + line number; +; +; Note: The symbol resolver appends the modulename and the module address seperated by an space + +ROS_ADDR2LINE=addr2line.exe --exe= + +;----------------------------------------------------------------------------------------- +; RosBoot specific settings +; + +; +; ROSBOOT_CMD +; +; This value is the command which is executed to gain debugging data +; this value is mandatory + +ROSBOOT_CMD=D:\reactos\qemu\qemu.exe -serial pipe:qemu -boot c -m 128 -L D:\reactos\qemu\ D:\reactos\RosVM.vmdk -pidfile pid.txt + +; +; ROSBOOT_PIDFILE +; +; This option stores the pid of the emulator process in a text file. +; + +ROSBOOT_PID_FILE=pid.txt + +; +; ROSBOOT_DEBUG_PORT +; +; This variable controls on where to look for debugging data. If the +; value is set to file, then sysreg will execute ROSBOOT_CMD and also +; open the file specified in ROSBOOT_DEBUG_FILE and read the debugging info from the file +; +; If the value is set to pipe, then sysreg will read from pipe created by the +; ROSBOOT_CMD +; +;ROSBOOT_DEBUG_PORT=file +ROSBOOT_DEBUG_PORT=pipe + +; +; ROSBOOT_DEBUG_FILE +; +; This value specifies the debug file. This variable must be set when using +; ROSBOOT_DEBUG_PORT=file +; +; Note: when ROSBOOT_DEBUG_PORT is set to pipe, then sysreg will write all received +; debug data to the specified debug file +; + +;ROSBOOT_DEBUG_FILE=D:\ReactOS\tools\sysreg\bsdebug.log +;ROSBOOT_DEBUG_FILE=D:\ReactOS\tools\sysreg\debug.log + +; ROSBOOT_DELAY_READ; +; +; When the emulator is started, it spends a little time loading and running through its +; BIOS. This time delays reading from the pipe/file untill the specified value +; +; the value is in seconds +; +; Note: if the value is not provided, then reading debug info is started immediately + +ROSBOOT_DELAY_READ=4 + + + +; ROSBOOT_TIME_OUT +; +; This variable is the maximum runtime of the ROSBOOT_CMD. If the command +; runs longer than this value, sysreg exits with success mode; +; +; Note: if you set the variable ROSBOOT_CHECK_POINT and the checkpoint is not reached +; within this time, sysreg exits with failure mode +; +; If the variable is not set, the default timeout is 1 minute +; +ROSBOOT_TIME_OUT=180.0 + +; ROSBOOT_CHECK_POINT +; +; RosBoot will stop executing when it finds a string in the form +; SYSREG_CHECKPOINT:CP_NAME +; +; CP_NAME is the value of the ROSBOOT_CHECK_POINT variable + +ROSBOOT_CHECK_POINT=SYSSETUP_COMPLETE + + +; ROSBOOT_CRITICAL_APP +; +; If an user-mode exception occurs in an critical application, i.e. setup.exe / explorer.exe, sysreg will report +; that the test has failed and quit debugging immediately +; +; if an user-mode exception occurs in any other application, sysreg will report the exception but the exception +; has no effect on the test result +; +; Note: if the value is set to IGNORE, sysreg will ignore all user-mode exceptions +; +; Note: if the variable is not set, then sysreg will stop on the first user-mode exception +; +; seperate each application with an space + + +ROSBOOT_CRITICAL_APP=setup.exe userinit.exe smss.exe winlogon.exe csrss.exe explorer.exe +;ROSBOOT_CRITICAL_APP=setup.exe userinit.exe smss.exe winlogon.exe csrss.exe explorer.exe lsass.exe + Modified: trunk/reactos/tools/sysreg/sysreg.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sysreg.cpp?re… ============================================================================== --- trunk/reactos/tools/sysreg/sysreg.cpp (original) +++ trunk/reactos/tools/sysreg/sysreg.cpp Tue Nov 14 15:58:52 2006 @@ -97,6 +97,7 @@ else { cout << "The regression test " << regtest->getName () << " failed" << endl; + return -2; } return 0; Added: trunk/reactos/tools/sysreg/txtmode.cfg URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/txtmode.cfg?r… ============================================================================== --- trunk/reactos/tools/sysreg/txtmode.cfg (added) +++ trunk/reactos/tools/sysreg/txtmode.cfg Tue Nov 14 15:58:52 2006 @@ -1,0 +1,119 @@ + ; ROS_OUTPUT +; +; This variable sets the location where to search symbol files for modules +; This is required when tracing usermode exceptions, bsod etc... +; +; If this value is not defined, sysreg looks for the environment variable +; ROS_OUTPUT. If this is also not set, it uses the default output-i386 + +ROS_OUTPUT=D:\reactos\output-i386 + +; ROS_ADDR2LINE +; +; This value is used by the symbol resolver to convert an module address into +; an source file + line number; +; +; Note: The symbol resolver appends the modulename and the module address seperated by an space + +ROS_ADDR2LINE=addr2line.exe --exe= + +;----------------------------------------------------------------------------------------- +; RosBoot specific settings +; + +; +; ROSBOOT_CMD +; +; This value is the command which is executed to gain debugging data +; this value is mandatory + +ROSBOOT_CMD=D:\reactos\qemu\qemu.exe -serial pipe:qemu -boot d -m 128 -L D:\reactos\qemu\ D:\reactos\RosVM.vmdk -cdrom D:\Reactos\ReactOS-RegTest.iso -pidfile pid.txt + +; +; ROSBOOT_PIDFILE +; +; This option stores the pid of the emulator process in a text file. +; + +ROSBOOT_PID_FILE=pid.txt + +; +; ROSBOOT_DEBUG_PORT +; +; This variable controls on where to look for debugging data. If the +; value is set to file, then sysreg will execute ROSBOOT_CMD and also +; open the file specified in ROSBOOT_DEBUG_FILE and read the debugging info from the file +; +; If the value is set to pipe, then sysreg will read from pipe created by the +; ROSBOOT_CMD +; +;ROSBOOT_DEBUG_PORT=file +ROSBOOT_DEBUG_PORT=pipe + +; +; ROSBOOT_DEBUG_FILE +; +; This value specifies the debug file. This variable must be set when using +; ROSBOOT_DEBUG_PORT=file +; +; Note: when ROSBOOT_DEBUG_PORT is set to pipe, then sysreg will write all received +; debug data to the specified debug file +; + +;ROSBOOT_DEBUG_FILE=D:\ReactOS\tools\sysreg\bsdebug.log +;ROSBOOT_DEBUG_FILE=D:\ReactOS\tools\sysreg\debug.log + +; ROSBOOT_DELAY_READ; +; +; When the emulator is started, it spends a little time loading and running through its +; BIOS. This time delays reading from the pipe/file untill the specified value +; +; the value is in seconds +; +; Note: if the value is not provided, then reading debug info is started immediately + +ROSBOOT_DELAY_READ=4 + + + +; ROSBOOT_TIME_OUT +; +; This variable is the maximum runtime of the ROSBOOT_CMD. If the command +; runs longer than this value, sysreg exits with success mode; +; +; Note: if you set the variable ROSBOOT_CHECK_POINT and the checkpoint is not reached +; within this time, sysreg exits with failure mode +; +; If the variable is not set, the default timeout is 1 minute +; +ROSBOOT_TIME_OUT=180.0 + +; ROSBOOT_CHECK_POINT +; +; RosBoot will stop executing when it finds a string in the form +; SYSREG_CHECKPOINT:CP_NAME +; +; CP_NAME is the value of the ROSBOOT_CHECK_POINT variable + +ROSBOOT_CHECK_POINT=USETUP_COMPLETE +;ROSBOOT_CHECK_POINT=SYSSETUP_COMPLETE +;ROSBOOT_CHECK_POINT=THIRDBOOT_COMPLETE + +; ROSBOOT_CRITICAL_APP +; +; If an user-mode exception occurs in an critical application, i.e. setup.exe / explorer.exe, sysreg will report +; that the test has failed and quit debugging immediately +; +; if an user-mode exception occurs in any other application, sysreg will report the exception but the exception +; has no effect on the test result +; +; Note: if the value is set to IGNORE, sysreg will ignore all user-mode exceptions +; +; Note: if the variable is not set, then sysreg will stop on the first user-mode exception +; +; seperate each application with an space + + +ROSBOOT_CRITICAL_APP=setup.exe userinit.exe smss.exe winlogon.exe csrss.exe explorer.exe +;ROSBOOT_CRITICAL_APP=setup.exe userinit.exe smss.exe winlogon.exe csrss.exe explorer.exe lsass.exe + Propchange: trunk/reactos/tools/sysreg/txtmode.cfg ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[janderwald] 24750: - implement target sysregtest which compiles all required modules and generates an unattended bootcdregtest which is feed to sysregtest and executes the required tests - fix regtest target
by janderwald＠svn.reactos.org 14 Nov '06

14 Nov '06

Author: janderwald Date: Tue Nov 14 15:47:42 2006 New Revision: 24750 URL: http://svn.reactos.org/svn/reactos?rev=24750&view=rev Log: - implement target sysregtest which compiles all required modules and generates an unattended bootcdregtest which is feed to sysregtest and executes the required tests - fix regtest target Modified: trunk/reactos/Makefile Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=24750&r1=2474… ============================================================================== --- trunk/reactos/Makefile (original) +++ trunk/reactos/Makefile Tue Nov 14 15:47:42 2006 @@ -402,11 +402,27 @@ ROS_OUTPUT=output-$(ARCH)-r \ world +sysregtest: + mkdir $(OUTPUT_)cd$(SEP)reactos + $(cp) boot$(SEP)bootdata$(SEP)unattend.inf.sample boot$(SEP)bootdata$(SEP)unattend.inf + $(cp) boot$(SEP)bootdata$(SEP)unattend.inf.sample $(OUTPUT_)cd$(SEP)reactos$(SEP)unattend.inf + $(cp) boot$(SEP)bootdata$(SEP)bootcdregtest$(SEP)testboot.bat.sample boot$(SEP)bootdata$(SEP)bootcdregtest$(SEP)testboot.bat + $(MAKE) dbgprint + $(MAKE) bootcdregtest + $(MAKE) sysreg + $(OUTPUT_)tools$(SEP)sysreg$(SEP)sysreg$(EXEPOSTFIX) tools$(SEP)sysreg$(SEP)txtmode.cfg rosboot + $(OUTPUT_)tools$(SEP)sysreg$(SEP)sysreg$(EXEPOSTFIX) tools$(SEP)sysreg$(SEP)secstage.cfg rosboot + $(OUTPUT_)tools$(SEP)sysreg$(SEP)sysreg$(EXEPOSTFIX) tools$(SEP)sysreg$(SEP)runonce.cfg rosboot + +sysregtest_clean: + $(rm) boot$(SEP)bootdata$(SEP)unattend.inf + $(rm) boot$(SEP)bootdata$(SEP)bootcdregtest$(SEP)testboot.bat + $(rm) $(OUTPUT_)cd$(SEP)reactos$(SEP)unattend.inf regtest: - $(cp) boot\bootdata\unattend.inf.sample output-i386\cd\reactos\unattend.inf + $(cp) boot$(SEP)bootdata$(SEP)unattend.inf.sample $(OUTPUT_)cd$(SEP)reactos$(SEP)unattend.inf $(MAKE) bootcdregtest - $(rm) output-i386\cd\reactos\unattend.inf + $(rm) $(OUTPUT_)cd$(SEP)reactos$(SEP)unattend.inf .PHONY: msvc msvc: $(RBUILD_TARGET)

1 0

[frik85] 24749: RosCMS update: * dynamic content section update
by frik85＠svn.reactos.org 13 Nov '06

13 Nov '06

Author: frik85 Date: Tue Nov 14 00:01:07 2006 New Revision: 24749 URL: http://svn.reactos.org/svn/reactos?rev=24749&view=rev Log: RosCMS update: * dynamic content section update Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_dyncontent.php trunk/web/reactos.org/htdocs/roscms/inc/admin_dyncontent_edit.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_dyncontent.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/inc/admin_dyncontent.php (original) +++ trunk/web/reactos.org/htdocs/roscms/inc/admin_dyncontent.php Tue Nov 14 00:01:07 2006 @@ -41,14 +41,14 @@ </ul> <p>Action: <a href="?page=<?php echo $rpm_page; ?>&sec=dyncontent&sec2=edit&sec3=news_page&opt=insert&<?php echo 'sort='.$rpm_sort.'&filt='.$rpm_filt.'&filt2='.$rpm_filt2.'&langid='.$rpm_lang_id ; ?>&db_id=new"> <?php if ($roscms_intern_usrgrp_admin == true && $rpm_page == "admin") { ?> - New - News</a> | <a href="?page=<?php echo $rpm_page; ?>&sec=dyncontent&sec2=edit&sec3=newsletter&opt=insert&<?php echo 'sort='.$rpm_sort.'&filt='.$rpm_filt.'&filt2='.$rpm_filt2.'&langid='.$rpm_lang_id ; ?>&db_id=new">New - Newsletter</a> | <a href="?page=<?php echo $rpm_page; ?>&sec=dyncontent&sec2=edit&sec3=blog&opt=insert&<?php echo 'sort='.$rpm_sort.'&filt='.$rpm_filt.'&filt2='.$rpm_filt2.'&langid='.$rpm_lang_id ; ?>&db_id=new">New - Blog</a> | <a href="?page=<?php echo $rpm_page; ?>&sec=dyncontent&sec2=edit&opt=insert&<?php echo 'sort='.$rpm_sort.'&filt='.$rpm_filt.'&filt2='.$rpm_filt2.'&langid='.$rpm_lang_id ; ?>&db_id=new"></a><a href="?page=<?php echo $rpm_page; ?>&sec=dyncontent&sec2=edit&opt=insert&<?php echo 'sort='.$rpm_sort.'&filt='.$rpm_filt.'&filt2='.$rpm_filt2.'&langid='.$rpm_lang_id ; ?>&db_id=new">New - Dynamic Content (plain)</a> | <a href="?page=<?php echo $rpm_page; ?>&sec=dyncontent&sec2=view"> + New News</a> | + <a href="?page=<?php echo $rpm_page; ?>&sec=dyncontent&sec2=edit&sec3=newsletter&opt=insert&<?php echo 'sort='.$rpm_sort.'&filt='.$rpm_filt.'&filt2='.$rpm_filt2.'&langid='.$rpm_lang_id ; ?>&db_id=new">New Newsletter</a> | + <a href="?page=<?php echo $rpm_page; ?>&sec=dyncontent&sec2=edit&sec3=interview&opt=insert&<?php echo 'sort='.$rpm_sort.'&filt='.$rpm_filt.'&filt2='.$rpm_filt2.'&langid='.$rpm_lang_id ; ?>&db_id=new">New Interview</a> | + <?php /* <a href="?page=<?php echo $rpm_page; ?>&sec=dyncontent&sec2=edit&sec3=blog&opt=insert&<?php echo 'sort='.$rpm_sort.'&filt='.$rpm_filt.'&filt2='.$rpm_filt2.'&langid='.$rpm_lang_id ; ?>&db_id=new">New Blog</a> | */ ?> + <a href="?page=<?php echo $rpm_page; ?>&sec=dyncontent&sec2=edit&opt=insert&<?php echo 'sort='.$rpm_sort.'&filt='.$rpm_filt.'&filt2='.$rpm_filt2.'&langid='.$rpm_lang_id ; ?>&db_id=new">New Dynamic Content (plain)</a> | + <a href="?page=<?php echo $rpm_page; ?>&sec=dyncontent&sec2=view"> <?php } ?> - reset - filters & sort</a></p> + reset filters & sort</a></p> <?php if($roscms_intern_account_level>50) { @@ -166,13 +166,21 @@ echo '<a href="?page='.$rpm_page.'&sec=dyncontent&sec2=view&sort='.$rpm_sort.'&filt='.$rpm_filt.'&filt2=newsletter&langid='.$rpm_lang_id.'">newsletter</a>'; } echo ' | '; + if ($rpm_filt2 == "interview") { + echo '<b>interview</b>'; + $ros_cms_intern_content_filt2 = " AND `dyn_content_name` = 'interview'"; + } + else { + echo '<a href="?page='.$rpm_page.'&sec=dyncontent&sec2=view&sort='.$rpm_sort.'&filt='.$rpm_filt.'&filt2=interview&langid='.$rpm_lang_id.'">interview</a>'; + } +/* echo ' | '; if ($rpm_filt2 == "blog") { echo '<b>blog</b>'; $ros_cms_intern_content_filt2 = " AND `dyn_content_name` = 'blog'"; } else { echo '<a href="?page='.$rpm_page.'&sec=dyncontent&sec2=view&sort='.$rpm_sort.'&filt='.$rpm_filt.'&filt2=blog&langid='.$rpm_lang_id.'">blog</a>'; - } + }*/ /*echo ' | '; if ($rpm_filt2 == "dev_page") { echo '<b>dev page</b>'; Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_dyncontent_edit.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/inc/admin_dyncontent_edit.php (original) +++ trunk/web/reactos.org/htdocs/roscms/inc/admin_dyncontent_edit.php Tue Nov 14 00:01:07 2006 @@ -49,6 +49,9 @@ elseif ($rpm_sec3 == "newsletter") { echo "<b>Newsletter Interface</b>"; } + elseif ($rpm_sec3 == "interview") { + echo "<b>Interview Interface</b>"; + } elseif ($rpm_sec3 == "blog") { echo "<b>Blog Interface</b>"; } @@ -67,13 +70,30 @@ <tr bgcolor="#5984C3"> <td bgcolor="#5984C3"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Content ID</strong></font></div></td> - <td bgcolor="#EEEEEE"> <input name="txt_contentid" type="text" id="txt_contentid" value="<?php echo $result_content['dyn_content_id']; ?>" size="20" maxlength="20"> </td> + <td bgcolor="#EEEEEE"> <input name="txt_contentid" type="text" id="txt_contentid" value="<?php + + if ($rpm_db_id == "new") { + $query_content_count = mysql_query("SELECT COUNT( * ) + FROM `dyn_content` + WHERE 1 + AND `dyn_content_name` = '".mysql_real_escape_string($rpm_sec3)."' + AND `dyn_content_nr` = '1' + ORDER BY dyn_content_id ASC ;"); + $result_content_count = mysql_fetch_row($query_content_count); + + echo ($result_content_count[0]+1); + } + else { + echo $result_content['dyn_content_id']; + } + + ?>" size="20" maxlength="20"> </td> </tr> <tr> <td valign="top" bgcolor="#5984C3"> <div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Language</strong></font></div></td> <td valign="top" bgcolor="#E2E2E2"><div align="left"> <?php - if ($rpm_sec3 == "news_page" || $rpm_sec3 == "newsletter") { + if ($rpm_sec3 == "news_page" || $rpm_sec3 == "newsletter" || $rpm_sec3 == "interview") { ?> <input name="txt_contentnr" type="hidden" value="1" /> <?php @@ -113,7 +133,7 @@ </div></td> </tr> <?php - if ($rpm_sec3 != "news_page" && $rpm_sec3 != "newsletter") { + if ($rpm_sec3 != "news_page" && $rpm_sec3 != "newsletter" && $rpm_sec3 != "interview") { ?> <tr bgcolor="#5984C3"> <td width="15%" bgcolor="#5984C3"> <div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Content @@ -141,6 +161,9 @@ elseif ($rpm_sec3 == "newsletter") { echo "Title"; } + elseif ($rpm_sec3 == "interview") { + echo "Title"; + } elseif ($rpm_sec3 == "blog") { echo "Title"; } @@ -152,7 +175,7 @@ <td valign="top" bgcolor="#EEEEEE"><input name="txt_content_text1" type="text" id="txt_content_text1" value="<?php echo $result_content['dyn_content_text1']; ?>" size="50" maxlength="100"></td> </tr> <?php - if ($rpm_sec3 != "news_page" && $rpm_sec3 != "newsletter") { + if ($rpm_sec3 != "news_page" && $rpm_sec3 != "newsletter" && $rpm_sec3 != "interview") { ?> <tr> <td valign="top" bgcolor="#5984C3"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong><?php @@ -162,6 +185,9 @@ elseif ($rpm_sec3 == "newsletter") { echo "-"; } + elseif ($rpm_sec3 == "interview") { + echo "-"; + } elseif ($rpm_sec3 == "blog") { echo "Category"; } @@ -183,6 +209,9 @@ elseif ($rpm_sec3 == "newsletter") { echo "Description"; } + elseif ($rpm_sec3 == "interview") { + echo "Description"; + } elseif ($rpm_sec3 == "blog") { echo "Description"; } @@ -202,6 +231,9 @@ echo "Content"; } elseif ($rpm_sec3 == "newsletter") { + echo "Content"; + } + elseif ($rpm_sec3 == "interview") { echo "Content"; } elseif ($rpm_sec3 == "blog") {

1 0

[frik85] 24748: RosCMS update: * fix some small page generator issues
by frik85＠svn.reactos.org 13 Nov '06

13 Nov '06

Author: frik85 Date: Mon Nov 13 19:43:49 2006 New Revision: 24748 URL: http://svn.reactos.org/svn/reactos?rev=24748&view=rev Log: RosCMS update: * fix some small page generator issues Modified: trunk/web/reactos.org/htdocs/roscms/inc/generator.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/generator.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/inc/generator.php (original) +++ trunk/web/reactos.org/htdocs/roscms/inc/generator.php Mon Nov 13 19:43:49 2006 @@ -20,12 +20,12 @@ // To prevent hacking activity: - if ( !defined('ROSCMS_SYSTEM') && $rpm_page != "generate_fast_secret") + if ( !defined('ROSCMS_SYSTEM') && $rpm_page != "generate") { die("die"); } - if ($rpm_page == "generate_fast_secret") { + if ($rpm_page == "generate") { $rpm_sec="generator"; $rpm_sec2="output"; $roscms_intern_account_id = "1"; @@ -294,7 +294,7 @@ $RosCMS_generator_log_entrycounter = 0; - $RosCMS_query_page = mysql_query("SELECT pages_extra, page_name, page_text, page_version, page_usrname_id + $RosCMS_query_page = mysql_query("SELECT pages_extra, page_name, page_title, page_text, page_version, page_usrname_id FROM pages WHERE ".$RosCMS_generator_pagename_sql." page_visible = '1' AND page_active = '1' @@ -338,10 +338,39 @@ $RosCMS_generator_page_content = $RosCMS_result_page['page_text']; if ($RosCMS_generator_output == "client") { - echo generator_page_data($RosCMS_result_page['page_name'], $RosCMS_generator_page_content, $RosCMS_generator_lang, $RosCMS_result_page['page_usrname_id'], $RosCMS_result_page['page_version'] ); + echo generator_page_data($RosCMS_result_page['page_name'], + $RosCMS_result_page['page_title'], + $RosCMS_generator_page_content, + $RosCMS_generator_lang, + $RosCMS_result_page['page_usrname_id'], + $RosCMS_result_page['page_version'], + $RosCMS_current_page_dynamic_flag + ); } elseif ($RosCMS_generator_output == "file") { - $RosCMS_generator_log .= generator_page_output_file( $RosCMS_result_page['page_name'], generator_page_data($RosCMS_generator_pagename, $RosCMS_generator_page_content, $RosCMS_generator_lang), $RosCMS_current_page_dynamic_cont_id, $RosCMS_result_page['page_usrname_id'], $RosCMS_result_page['page_version'] ); + $RosCMS_generator_log .= generator_page_output_file( $RosCMS_result_page['page_name'], + generator_page_data($RosCMS_generator_pagename, + $RosCMS_result_page['page_title'], + $RosCMS_generator_page_content, + $RosCMS_generator_lang, + $RosCMS_result_page['page_usrname_id'], + $RosCMS_result_page['page_version'], + $RosCMS_current_page_dynamic_flag + ), + $RosCMS_current_page_dynamic_cont_id + ); + /* + $RosCMS_current_page, + $RosCMS_current_page_title, + $RosCMS_current_page_content, + $RosCMS_generator_page_lang, + $RosCMS_generator_page_usrid, + $RosCMS_generator_page_version, + $RosCMS_current_page_dynamic_flag + + $RosCMS_current_page_name, + $RosCMS_current_page_content, + $RosCMS_current_page_dynamic_cont_id*/ $showtimef=""; } @@ -379,13 +408,12 @@ } -function generator_page_data ($RosCMS_current_page, $RosCMS_current_page_content, $RosCMS_generator_page_lang, $RosCMS_generator_page_usrid = "0", $RosCMS_generator_page_version = "1") { +function generator_page_data ($RosCMS_current_page, $RosCMS_current_page_title, $RosCMS_current_page_content, $RosCMS_generator_page_lang, $RosCMS_generator_page_usrid = "0", $RosCMS_generator_page_version = "1", $RosCMS_current_page_dynamic_flag) { global $RosCMS_global_current_page_lang; global $roscms_intern_path_server; global $RosCMS_current_page_dynamic_cont_id; global $roscms_intern_account_id; global $roscms_intern_usrnameid; - global $RosCMS_current_page_dynamic_flag; global $RosCMS_global_generator_extention; @@ -412,7 +440,7 @@ // current page name: $RosCMS_current_page_content = str_replace("[#roscms_pagename]", $RosCMS_current_page."_".$RosCMS_current_page_dynamic_cont_id, $RosCMS_current_page_content); // current page title: - $RosCMS_current_page_content = str_replace("[#roscms_pagetitle]", ucfirst($RosCMS_current_page."_".$RosCMS_current_page_dynamic_cont_id), $RosCMS_current_page_content); + $RosCMS_current_page_content = str_replace("[#roscms_pagetitle]", ucfirst($RosCMS_current_page_title)." #".$RosCMS_current_page_dynamic_cont_id, $RosCMS_current_page_content); } else { // current filename: @@ -420,7 +448,7 @@ // current page name: $RosCMS_current_page_content = str_replace("[#roscms_pagename]", $RosCMS_current_page, $RosCMS_current_page_content); // current page title: - $RosCMS_current_page_content = str_replace("[#roscms_pagetitle]", $RosCMS_current_page, $RosCMS_current_page_content); + $RosCMS_current_page_content = str_replace("[#roscms_pagetitle]", ucfirst($RosCMS_current_page_title), $RosCMS_current_page_content); } // current language: $RosCMS_query_current_language = mysql_query("SELECT * @@ -432,11 +460,12 @@ // current language: $RosCMS_current_page_content = str_replace("[#roscms_language_short]", $RosCMS_global_current_page_lang, $RosCMS_current_page_content); // current page format (xhtml/html): - $RosCMS_current_page_content = str_replace("[#roscms_format]","html", $RosCMS_current_page_content); - // current date - $RosCMS_current_page_content = str_replace("[#roscms_date]",date("Y-m-d"),$RosCMS_current_page_content); + $RosCMS_current_page_content = str_replace("[#roscms_format]", "html", $RosCMS_current_page_content); + // current date: + $RosCMS_current_page_content = str_replace("[#roscms_date]", date("Y-m-d"), $RosCMS_current_page_content); $zeit = localtime(time() , 1); - $RosCMS_current_page_content = str_replace("[#roscms_time]", sprintf("%02d",$zeit['tm_hour']).":".sprintf("%02d",$zeit['tm_min']),$RosCMS_current_page_content); // current time + // current time: + $RosCMS_current_page_content = str_replace("[#roscms_time]", sprintf("%02d", $zeit['tm_hour']).":".sprintf("%02d",$zeit['tm_min']), $RosCMS_current_page_content); $query_usraccountb= mysql_query("SELECT user_name FROM `users` WHERE `user_id` = '".mysql_real_escape_string($roscms_intern_account_id)."' LIMIT 1 ;"); @@ -447,7 +476,7 @@ FROM `users` WHERE `user_id` = '".mysql_real_escape_string($roscms_intern_usrnameid)."' LIMIT 1 ;"); $result_usraccount=mysql_fetch_array($query_usraccount); - // account that generate + // account that generate: $RosCMS_current_page_content = str_replace("[#roscms_user]", $result_usraccountb['user_name'], $RosCMS_current_page_content); // account that changed the include text: $RosCMS_current_page_content = str_replace("[#roscms_inc_author]", $result_usraccount['user_name'], $RosCMS_current_page_content); @@ -459,7 +488,7 @@ $RosCMS_current_page_content = str_replace("[#roscms_page_version]", $RosCMS_generator_page_version, $RosCMS_current_page_content); - // Replace high chars by their html-escaped version + // Replace high chars by their html-escaped version: if ($RosCMS_global_generator_extention == true) { $RosCMS_current_page_content = roscms_unicode_escape($RosCMS_current_page_content); } @@ -483,11 +512,12 @@ function insert_content($matches) { global $RosCMS_global_current_page_lang; + global $roscms_intern_account_id; // extract the name, e.g. [#cont_about] ... "about" $RosCMS_current_content_name = substr($matches[0], 7, (strlen($matches[0])-8)); - $RosCMS_query_content = mysql_query("SELECT content_text + $RosCMS_query_content = mysql_query("SELECT content_text, content_date, content_time, content_lang, content_version FROM content WHERE content_name = '".mysql_real_escape_string($RosCMS_current_content_name)."' AND content_visible = '1' @@ -497,7 +527,26 @@ LIMIT 1 ;"); $RosCMS_result_content = mysql_fetch_array($RosCMS_query_content); - return $RosCMS_result_content['content_text']; + $RosCMS_result_content_temp = $RosCMS_result_content['content_text']; + + + // latest content changes: + $query_usraccountc= mysql_query("SELECT user_name, user_fullname + FROM `users` + WHERE `user_id` = '".mysql_real_escape_string($roscms_intern_account_id)."' LIMIT 1 ;"); + $result_usraccountc=mysql_fetch_array($query_usraccountc); + + if ($result_usraccountc['user_fullname']) { + $RosCMS_result_user_temp = $result_usraccountc['user_fullname']." (".$result_usraccountc['user_name'].")"; + } + else { + $RosCMS_result_user_temp = $result_usraccountc['user_name']; + } + + $RosCMS_result_content_temp = str_replace("[#roscms_content_version]", "<i>Last modified: ".$RosCMS_result_content['content_date']." ".$RosCMS_result_content['content_time'].", rev. ".$RosCMS_result_content['content_version']." by ".$RosCMS_result_user_temp."</i>", $RosCMS_result_content_temp); + + + return $RosCMS_result_content_temp; } function insert_inctext($matches) { @@ -585,6 +634,7 @@ function generator_page_output_file ( $RosCMS_current_page_name, $RosCMS_current_page_content, $RosCMS_current_page_dynamic_cont_id ) { global $RosCMS_global_current_page_lang; global $roscms_intern_version; + global $roscms_intern_account_id; // Extract the dynamic page id: if ( is_numeric(substr(strrchr($RosCMS_current_page_name,"_"), 1, strlen(strrchr($RosCMS_current_page_name,"_")-1))) ) { @@ -629,6 +679,20 @@ fputs($fp,"\n\n"); flock($fp,3); fclose($fp); + + + // Update generation time & user information: + $page_gen_timestamp_query="UPDATE `pages` + SET `page_generate_usrid` = '".mysql_real_escape_string($roscms_intern_account_id)."', + `page_generate_timestamp` = '".mysql_real_escape_string(time())."' + WHERE page_name = '".mysql_real_escape_string($RosCMS_current_page_name_save)."' + AND page_visible = '1' + AND page_active = '1' + AND (page_language = '".mysql_real_escape_string($RosCMS_global_current_page_lang)."' OR page_language = 'all') + ORDER BY page_language DESC + LIMIT 1 ;"; + $page_gen_timestamp_list=mysql_query($page_gen_timestamp_query); + return " <li>".$RosCMS_current_page_out_file; }

1 0

[winesync] 24747: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 13 Nov '06

13 Nov '06

Author: winesync Date: Mon Nov 13 18:20:30 2006 New Revision: 24747 URL: http://svn.reactos.org/svn/reactos?rev=24747&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/cabinet/cabinet_main.c trunk/reactos/dll/win32/cabinet/fdi.c Modified: trunk/reactos/dll/win32/cabinet/cabinet_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/cabinet_… ============================================================================== --- trunk/reactos/dll/win32/cabinet/cabinet_main.c (original) +++ trunk/reactos/dll/win32/cabinet/cabinet_main.c Mon Nov 13 18:20:30 2006 @@ -219,7 +219,7 @@ if ((pDestination->flags & EXTRACT_EXTRACTFILES) || file_in_list(pDestination->filterlist, pfdin->psz1)) { - /* skip this file it it's not in the file list */ + /* skip this file if it is not in the file list */ if (!file_in_list(pDestination->filelist, pfdin->psz1)) return 0; Modified: trunk/reactos/dll/win32/cabinet/fdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/fdi.c?re… ============================================================================== --- trunk/reactos/dll/win32/cabinet/fdi.c (original) +++ trunk/reactos/dll/win32/cabinet/fdi.c Mon Nov 13 18:20:30 2006 @@ -945,7 +945,7 @@ /********************************************************* * fdi_Ziphuft_build (internal) */ -static cab_LONG fdi_Ziphuft_build(cab_ULONG *b, cab_ULONG n, cab_ULONG s, cab_UWORD *d, cab_UWORD *e, +static cab_LONG fdi_Ziphuft_build(cab_ULONG *b, cab_ULONG n, cab_ULONG s, const cab_UWORD *d, const cab_UWORD *e, struct Ziphuft **t, cab_LONG *m, fdi_decomp_state *decomp_state) { cab_ULONG a; /* counter for codes of length k */ @@ -1125,7 +1125,7 @@ /********************************************************* * fdi_Zipinflate_codes (internal) */ -cab_LONG fdi_Zipinflate_codes(struct Ziphuft *tl, struct Ziphuft *td, +static cab_LONG fdi_Zipinflate_codes(struct Ziphuft *tl, struct Ziphuft *td, cab_LONG bl, cab_LONG bd, fdi_decomp_state *decomp_state) { register cab_ULONG e; /* table entry flag/number of extra bits */ @@ -1272,16 +1272,14 @@ for(; i < 288; i++) /* make a complete, but wrong code set */ l[i] = 8; fixed_bl = 7; - if((i = fdi_Ziphuft_build(l, 288, 257, (cab_UWORD *) Zipcplens, - (cab_UWORD *) Zipcplext, &fixed_tl, &fixed_bl, decomp_state))) + if((i = fdi_Ziphuft_build(l, 288, 257, Zipcplens, Zipcplext, &fixed_tl, &fixed_bl, decomp_state))) return i; /* distance table */ for(i = 0; i < 30; i++) /* make an incomplete code set */ l[i] = 5; fixed_bd = 5; - if((i = fdi_Ziphuft_build(l, 30, 0, (cab_UWORD *) Zipcpdist, (cab_UWORD *) Zipcpdext, - &fixed_td, &fixed_bd, decomp_state)) > 1) + if((i = fdi_Ziphuft_build(l, 30, 0, Zipcpdist, Zipcpdext, &fixed_td, &fixed_bd, decomp_state)) > 1) { fdi_Ziphuft_free(CAB(hfdi), fixed_tl); return i; @@ -1409,16 +1407,14 @@ /* build the decoding tables for literal/length and distance codes */ bl = ZIPLBITS; - if((i = fdi_Ziphuft_build(ll, nl, 257, (cab_UWORD *) Zipcplens, (cab_UWORD *) Zipcplext, - &tl, &bl, decomp_state)) != 0) + if((i = fdi_Ziphuft_build(ll, nl, 257, Zipcplens, Zipcplext, &tl, &bl, decomp_state)) != 0) { if(i == 1) fdi_Ziphuft_free(CAB(hfdi), tl); return i; /* incomplete code set */ } bd = ZIPDBITS; - fdi_Ziphuft_build(ll + nl, nd, 0, (cab_UWORD *) Zipcpdist, (cab_UWORD *) Zipcpdext, - &td, &bd, decomp_state); + fdi_Ziphuft_build(ll + nl, nd, 0, Zipcpdist, Zipcpdext, &td, &bd, decomp_state); /* decompress until an end-of-block code */ if(fdi_Zipinflate_codes(tl, td, bl, bd, decomp_state))

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs