19 Jul
2007
19 Jul
'07
1:43 p.m.
Author: janderwald
Date: Thu Jul 19 17:43:49 2007
New Revision: 27728
URL: http://svn.reactos.org/svn/reactos?rev=27728&view=rev
Log:
- fix warning
- simplify sysreg configuration options (implementation is coming next)
Removed:
trunk/reactos/tools/sysreg/runonce.cfg
trunk/reactos/tools/sysreg/sample.cfg
trunk/reactos/tools/sysreg/secstage.cfg
Modified:
trunk/reactos/tools/sysreg/os_support.cpp
trunk/reactos/tools/sysreg/txtmode.cfg
Modified: trunk/reactos/tools/sysreg/os_support.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/os_support.cp…
==============================================================================
--- trunk/reactos/tools/sysreg/os_support.cpp (original)
+++ trunk/reactos/tools/sysreg/os_support.cpp Thu Jul 19 17:43:49 2007
@@ -59,7 +59,7 @@
}
void OsSupport::sleep(long value)
{
- _sleep(value);
+ Sleep(value);
}
#else
/********************************************************************************************************************/
Removed: 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 (removed)
@@ -1,109 +1,0 @@
- ; 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_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\runonce.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
-
Removed: trunk/reactos/tools/sysreg/sample.cfg
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sample.cfg?re…
==============================================================================
--- trunk/reactos/tools/sysreg/sample.cfg (original)
+++ trunk/reactos/tools/sysreg/sample.cfg (removed)
@@ -1,111 +1,0 @@
-; 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:\sysreg\qemu\qemu.exe -serial pipe:qemu -boot c -m 128 -L D:\sysreg\qemu\
D:\sysreg\qemu\RosVM.vmdk -cdrom D:\Reactos\ReactOS-RegTest.iso -
-
-;
-; 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
-
-;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=30.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_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
-
-;ROSBOOT_TERMINATE_EMULATOR
-;
-; Terminate the emulator when sysreg exits, default no
-;
-;ROSBOOT_TERMINATE_EMULATOR=no
-ROSBOOT_TERMINATE_EMULATOR=yes
Removed: 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 (removed)
@@ -1,110 +1,0 @@
- ; 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_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\secstage.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/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 Thu Jul 19 17:43:49 2007
@@ -1,112 +1,79 @@
- ; ROS_OUTPUT
+; ROS_EMULATOR_TYPE
;
-; This variable sets the location where to search symbol files for modules
-; This is required when tracing usermode exceptions, bsod etc...
+; This variable defines which emulator should be used to emulate ReactOS
;
-; 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_EMU_TYPE=[qemu|vmware]
-ROS_OUTPUT=D:\reactos\output-i386
+ROS_EMU_TYPE=qemu
-; ROS_ADDR2LINE
+; ROS_EMU_PATH
;
-; This value is used by the symbol resolver to convert an module address into
-; an source file + line number;
+; This variable sets the path to the emulator
;
-; Note: The symbol resolver appends the modulename and the module address seperated by an
space
+;ROS_EMU_PATH=/usr/bin/qemu
+ROS_EMU_PATH=E:\reactos\qemu\qemu.exe
-ROS_ADDR2LINE=addr2line.exe --exe=
-;-----------------------------------------------------------------------------------------
-; RosBoot specific settings
+; ROS_HD_IMAGE
+;
+; The hdd image to use for running the emulator. If this variable is not
+; set, SysReg will create a HDD with name "ros.img" using the qemu-img tool. It
will search
+; this tool in the directory of emulator and abort if the tool cannot be found
+
+ROS_HD_IMAGE=E:\reactos\qemu\RosVMDK.img
+
+; ROS_CD_IMAGE
+;
+; Set this variable if you want sysreg to perform a full ReactOS installation using
+; an ReactOS unattended installation disk. If this variable is not set, SysReg lets the
emulator boot
+; from harddisk.
;
-;
-; ROSBOOT_CMD
-;
-; This value is the command which is executed to gain debugging data
-; this value is mandatory
+ROS_CD_IMAGE=E:\reactos\qemu\Reactos-RegTest.iso
-;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_CMD=/usr/bin/qemu -serial file:/home/freenet/reactos/tools/sysreg/txtmode.log
-boot d -m 64 -L /home/freenet/reactos/qemu /home/freenet/reactos/qemu/c.img -cdrom
/home/freenet/reactos/ReactOS.iso
-
-;
-; 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
+;-------------------------------------------------------------------------------------------
+; Additional Options
;
-;ROSBOOT_DEBUG_FILE=D:\ReactOS\tools\sysreg\txtmode.log
-ROSBOOT_DEBUG_FILE=/home/freenet/reactos/tools/sysreg/txtmode.log
+; ROS_MAX_TIME
+;
+;
+; Set this variable to value which is the maximum time the emulator lets ReactOS run
+; If not set, the emulator runs as long as no exception occurs in the emulator.
+; ROS_MAX_TIME=180.0
-; ROSBOOT_DELAY_READ;
+; ROS_LOG_FILE
+;
+; filename of log which receives all debugging data gained from the Emulator
+; ROS_LOG_FILE=debug.log
+
+; ROS_SYM_DIR
+;
+; This directory sets the location where to search symbol files for modules
+; In case of an BSOD, usermode exception, Sysreg will attempt to create a backtrace
+; from the debugging data
+;
+; ROS_SYM_DIR=E:\reactos\output-i386
+
+; ROS_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
+; BIOS. This time delays reading from the pipe/file untill the specified value.
;
-; the value is in seconds
+; Note: set this value if you have problems with timeouts or cutoff debugging data
;
-; Note: if the value is not provided, then reading debug info is started immediately
+; ROS_DELAY_READ=4
-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
+; ROS_CHECK_POINT
;
; RosBoot will stop executing when it finds a string in the form
-; SYSREG_CHECKPOINT:CP_NAME
+; SYSREG_CHECKPOINT:YOUR_CHECKPOINT_NAME
;
-; CP_NAME is the value of the ROSBOOT_CHECK_POINT variable
+;ROS_CHECK_POINT=YOUR_CHECKPOINT_NAME
-;ROSBOOT_CHECK_POINT=USETUP_COMPLETE
-ROSBOOT_CHECK_POINT=SYSSETUP_COMPLETE
-ROSBOOT_CHECK_POINT=THIRDBOOT_COMPLETE
-
-; ROSBOOT_CRITICAL_APP
+;ROS_CRITICAL_IMAGE
;
-; If an user-mode exception occurs in an critical application, i.e. setup.exe /
explorer.exe, sysreg will report
+; If an user-mode exception occurs in an critical application, dll etc, 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
+;ROS_CRITICAL_IMAGE=setup.exe userinit.exe smss.exe winlogon.exe csrss.exe explorer.exe