Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 24596: return code scanner for D3DParseUnknownCommand to figout what it support.
by greatlrd＠svn.reactos.org 22 Oct '06

22 Oct '06

Author: greatlrd Date: Sun Oct 22 11:15:06 2006 New Revision: 24596 URL: http://svn.reactos.org/svn/reactos?rev=24596&view=rev Log: return code scanner for D3DParseUnknownCommand to figout what it support. Added: trunk/rosapps/tests/D3DParseUnknownCommand_show/ trunk/rosapps/tests/D3DParseUnknownCommand_show/D3DParseUnknownCommand_show.rbuild (with props) trunk/rosapps/tests/D3DParseUnknownCommand_show/main.c (with props) Modified: trunk/rosapps/tests/directory.rbuild Added: trunk/rosapps/tests/D3DParseUnknownCommand_show/D3DParseUnknownCommand_show.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/tests/D3DParseUnknownComma… ============================================================================== --- trunk/rosapps/tests/D3DParseUnknownCommand_show/D3DParseUnknownCommand_show.rbuild (added) +++ trunk/rosapps/tests/D3DParseUnknownCommand_show/D3DParseUnknownCommand_show.rbuild Sun Oct 22 11:15:06 2006 @@ -1,0 +1,11 @@ +<module name="D3DParseUnknownCommand_show" type="win32cui" installbase="bin" installname="D3DParseUnknownCommand_show" allowwarnings="true"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + <library>kernel32</library> + <library>gdi32</library> + <library>ddraw</library> + <library>string</library> + <library>user32</library> + <file>main.c</file> +</module> Propchange: trunk/rosapps/tests/D3DParseUnknownCommand_show/D3DParseUnknownCommand_show.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/tests/D3DParseUnknownCommand_show/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/tests/D3DParseUnknownComma… ============================================================================== --- trunk/rosapps/tests/D3DParseUnknownCommand_show/main.c (added) +++ trunk/rosapps/tests/D3DParseUnknownCommand_show/main.c Sun Oct 22 11:15:06 2006 @@ -1,0 +1,49 @@ + +#include <windows.h> +#include <stdio.h> + +#include <ddrawi.h> +#include <d3dhal.h> + +/* Black Box program for D3DParseUnknownCommand in ddraw.dll + * + * This program scaning all return valu that D3DParseUnknownCommand have in ddraw.dll + * This command is not 100% document in MSDN so I using ddk kit doc and WinCE document + * and ms ddk / ms sdk to figout the basic. and MSDN was unclare what this command support for + * D3DHAL_DP2COMMAND dp2command->bCommand so I wrote this small scanner + * + * it will show D3DParseUnknownCommand dp2command->bCommand support follow command + * command hex dec + * D3DDP2OP_VIEWPORTINFO (aka 0x1c) 28 + * D3DDP2OP_WINFO (aka 0x1d) 29 + * Unknown (aka 0x0d) 13 + * + * no doc in msdn about command 13 (dec) I will exaime it later + * + */ + +INT main(INT argc, CHAR argv[]); +VOID BuildReturnCode(DWORD * ReturnCode); + +INT main(INT argc, TCHAR argv[]) +{ + DWORD ReturnCode[256]; + + BuildReturnCode(ReturnCode); + + return 0; +} + +VOID BuildReturnCode(DWORD * ReturnCode) +{ + INT t; + D3DHAL_DP2COMMAND dp2command; + DWORD lplpvReturnedCommand[2]; + + for (t=0;t<256;t++) + { + dp2command.bCommand = t; + ReturnCode[t] = D3DParseUnknownCommand ( (LPVOID) &dp2command, (LPVOID *) lplpvReturnedCommand) ; + printf("D3DParseUnknownCommand return code = %x command %d \n", ReturnCode[t], t); + } +} Propchange: trunk/rosapps/tests/D3DParseUnknownCommand_show/main.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/tests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/tests/directory.rbuild?rev… ============================================================================== --- trunk/rosapps/tests/directory.rbuild (original) +++ trunk/rosapps/tests/directory.rbuild Sun Oct 22 11:15:06 2006 @@ -67,6 +67,9 @@ <directory name="dnsquery"> <xi:include href="dnsquery/dnsquery.rbuild" /> </directory> +<directory name="D3DParseUnknownCommand_show"> + <xi:include href="D3DParseUnknownCommand_show/D3DParseUnknownCommand_show.rbuild" /> +</directory> <directory name="DxHalTest"> <xi:include href="DxHalTest/DxHalTest.rbuild" /> </directory>

1 0

[ion] 24595: - Implement DbgkpQueueMessage. This is the main bi-directional communication routine for the newer non-LPC Debug Object. - Implement DbgkPostFakeProcessCreateMessages (and stub DbgkpPostFakeThreadMessages and DbgkpPostFakeModuleMessages). These are required when attaching to a process after threads have been created and modules loaded, so that the debugger can have a valid state. - Still missing the two functions to Set/Clear the Debug Object, will do these next.
by ion＠svn.reactos.org 21 Oct '06

21 Oct '06

Author: ion Date: Sat Oct 21 23:26:54 2006 New Revision: 24595 URL: http://svn.reactos.org/svn/reactos?rev=24595&view=rev Log: - Implement DbgkpQueueMessage. This is the main bi-directional communication routine for the newer non-LPC Debug Object. - Implement DbgkPostFakeProcessCreateMessages (and stub DbgkpPostFakeThreadMessages and DbgkpPostFakeModuleMessages). These are required when attaching to a process after threads have been created and modules loaded, so that the debugger can have a valid state. - Still missing the two functions to Set/Clear the Debug Object, will do these next. Modified: trunk/reactos/ntoskrnl/dbgk/debug.c Modified: trunk/reactos/ntoskrnl/dbgk/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/debug.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/dbgk/debug.c (original) +++ trunk/reactos/ntoskrnl/dbgk/debug.c Sat Oct 21 23:26:54 2006 @@ -23,7 +23,35 @@ DEBUG_OBJECT_ALL_ACCESS }; +static const INFORMATION_CLASS_INFO DbgkpDebugObjectInfoClass[] = +{ + /* DebugObjectUnusedInformation */ + ICI_SQ_SAME(sizeof(ULONG), sizeof(ULONG), 0), + /* DebugObjectKillProcessOnExitInformation */ + ICI_SQ_SAME(sizeof(DEBUG_OBJECT_KILL_PROCESS_ON_EXIT_INFORMATION), sizeof(ULONG), ICIF_SET), +}; + /* PRIVATE FUNCTIONS *********************************************************/ + +NTSTATUS +NTAPI +DbgkpSetProcessDebugObject(IN PEPROCESS Process, + IN PDEBUG_OBJECT DebugObject, + IN NTSTATUS MsgStatus, + IN PETHREAD LastThread) +{ + /* FIXME: TODO */ + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +DbgkClearProcessDebugObject(IN PEPROCESS Process, + IN PDEBUG_OBJECT SourceDebugObject) +{ + /* FIXME: TODO */ + return STATUS_UNSUCCESSFUL; +} NTSTATUS NTAPI @@ -33,8 +61,157 @@ IN ULONG Flags, IN PDEBUG_OBJECT TargetObject OPTIONAL) { - /* FIXME: TODO */ - return STATUS_UNSUCCESSFUL; + PDEBUG_EVENT DebugEvent; + DEBUG_EVENT LocalDebugEvent; + PDEBUG_OBJECT DebugObject; + NTSTATUS Status; + BOOLEAN NewEvent; + PAGED_CODE(); + + /* Check if we have to allocate a debug event */ + NewEvent = (Flags & 2) ? TRUE : FALSE; + if (NewEvent) + { + /* Allocate it */ + DebugEvent = ExAllocatePoolWithTag(NonPagedPool, + sizeof(DEBUG_EVENT), + TAG('D', 'b', 'g', 'E')); + if (!DebugEvent) return STATUS_INSUFFICIENT_RESOURCES; + + /* Set flags */ + DebugEvent->Flags = Flags | 4; + + /* Reference the thread and process */ + ObReferenceObject(Thread); + ObReferenceObject(Process); + + /* Set the current thread */ + DebugEvent->BackoutThread = PsGetCurrentThread(); + + /* Set the debug object */ + DebugObject = TargetObject; + } + else + { + /* Use the debug event on the stack */ + DebugEvent = &LocalDebugEvent; + DebugEvent->Flags = Flags; + + /* Acquire the port lock */ + ExAcquireFastMutex(&DbgkpProcessDebugPortMutex); + + /* Get the debug object */ + DebugObject = Process->DebugPort; + + /* Check what kind of API message this is */ + switch (Message->ApiNumber) + { + /* Process or thread creation */ + case DbgKmCreateThreadApi: + case DbgKmCreateProcessApi: + + /* Make sure we're not skipping creation messages */ + if (Thread->SkipCreationMsg) DebugObject = NULL; + break; + + /* Process or thread exit */ + case DbgKmExitThreadApi: + case DbgKmExitProcessApi: + + /* Make sure we're not skipping exit messages */ + if (Thread->SkipTerminationMsg) DebugObject = NULL; + + /* No special handling for other messages */ + default: + break; + } + } + + /* Setup the Debug Event */ + KeInitializeEvent(&DebugEvent->ContinueEvent, SynchronizationEvent, FALSE); + DebugEvent->Process = Process; + DebugEvent->Thread = Thread; + RtlMoveMemory(&DebugEvent->ApiMsg, Message, sizeof(DBGKM_MSG)); + DebugEvent->ClientId = Thread->Cid; + + /* Check if we have a port object */ + if (!DebugObject) + { + /* Fail */ + Status = STATUS_PORT_NOT_SET; + } + else + { + /* Acquire the debug object mutex */ + ExAcquireFastMutex(&DebugObject->Mutex); + + /* Check if a debugger is active */ + if (!DebugObject->DebuggerInactive) + { + /* Add the event into the object's list */ + InsertTailList(&DebugObject->EventList, &DebugEvent->EventList); + + /* Check if we have to signal it */ + if (!NewEvent) + { + /* Signal it */ + KeSetEvent(&DebugObject->EventsPresent, + IO_NO_INCREMENT, + FALSE); + } + + /* Set success */ + Status = STATUS_SUCCESS; + } + else + { + /* No debugger */ + Status = STATUS_DEBUGGER_INACTIVE; + } + + /* Release the object lock */ + ExReleaseFastMutex(&DebugObject->Mutex); + } + + /* Check if we had acquired the port lock */ + if (!NewEvent) + { + /* Release it */ + ExReleaseFastMutex(&DbgkpProcessDebugPortMutex); + + /* Check if we got here through success */ + if (NT_SUCCESS(Status)) + { + /* Wait on the continue event */ + KeWaitForSingleObject(&DebugEvent->ContinueEvent, + Executive, + KernelMode, + FALSE, + NULL); + + /* Copy API Message back */ + RtlMoveMemory(Message, &DebugEvent->ApiMsg, sizeof(DBGKM_MSG)); + + /* Set return status */ + Status = DebugEvent->Status; + } + } + else + { + /* Check if we failed */ + if (!NT_SUCCESS(Status)) + { + /* Dereference the process and thread */ + ObDereferenceObject(Thread); + ObDereferenceObject(Process); + + /* Free the debug event */ + ExFreePool(DebugEvent); + } + } + + /* Return status */ + return Status; } NTSTATUS @@ -283,33 +460,74 @@ NTSTATUS NTAPI +DbgkpPostFakeModuleMessages(IN PEPROCESS Process, + IN PETHREAD Thread, + IN PDEBUG_OBJECT DebugObject) +{ + /* FIXME: TODO */ + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +DbgkpPostFakeThreadMessages(IN PEPROCESS Process, + IN PDEBUG_OBJECT DebugObject, + IN PETHREAD StartThread, + OUT PETHREAD *FirstThread, + OUT PETHREAD *LastThread) +{ + /* FIXME: TODO */ + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI DbgkpPostFakeProcessCreateMessages(IN PEPROCESS Process, IN PDEBUG_OBJECT DebugObject, - IN PETHREAD *LastThread) -{ - /* FIXME: Implement */ - *LastThread = NULL; - return STATUS_UNSUCCESSFUL; -} - -NTSTATUS -NTAPI -DbgkpSetProcessDebugObject(IN PEPROCESS Process, - IN PDEBUG_OBJECT DebugObject, - IN NTSTATUS MsgStatus, - IN PETHREAD LastThread) -{ - /* FIXME: TODO */ - return STATUS_UNSUCCESSFUL; -} - -NTSTATUS -NTAPI -DbgkClearProcessDebugObject(IN PEPROCESS Process, - IN PDEBUG_OBJECT SourceDebugObject) -{ - /* FIXME: TODO */ - return STATUS_UNSUCCESSFUL; + OUT PETHREAD *LastThread) +{ + KAPC_STATE ApcState; + PETHREAD FirstThread, FinalThread; + PETHREAD ReturnThread = NULL; + NTSTATUS Status; + PAGED_CODE(); + + /* Attach to the process */ + KeStackAttachProcess(&Process->Pcb, &ApcState); + + /* Post the fake thread messages */ + Status = DbgkpPostFakeThreadMessages(Process, + DebugObject, + NULL, + &FirstThread, + &FinalThread); + if (NT_SUCCESS(Status)) + { + /* Send the fake module messages too */ + Status = DbgkpPostFakeModuleMessages(Process, + FirstThread, + DebugObject); + if (!NT_SUCCESS(Status)) + { + /* We failed, dereference the final thread */ + ObDereferenceObject(FinalThread); + } + else + { + /* Set the final thread */ + ReturnThread = FinalThread; + } + + /* Dereference the first thread */ + ObDereferenceObject(FirstThread); + } + + /* Detach from the process */ + KeUnstackDetachProcess(&ApcState); + + /* Return the last thread */ + *LastThread = ReturnThread; + return Status; } VOID @@ -1003,14 +1221,6 @@ return Status; } -static const INFORMATION_CLASS_INFO DbgkpDebugObjectInfoClass[] = -{ - /* DebugObjectUnusedInformation */ - ICI_SQ_SAME(sizeof(ULONG), sizeof(ULONG), 0), - /* DebugObjectKillProcessOnExitInformation */ - ICI_SQ_SAME(sizeof(DEBUG_OBJECT_KILL_PROCESS_ON_EXIT_INFORMATION), sizeof(ULONG), ICIF_SET), -}; - NTSTATUS NTAPI NtSetInformationDebugObject(IN HANDLE DebugHandle, @@ -1034,16 +1244,19 @@ DebugInformationLength, PreviousMode); - /* Return required length to user-mode */ + /* Check if the caller wanted the return length */ if (ReturnLength) { + /* Enter SEH for probe */ _SEH_TRY { + /* Return required length to user-mode */ ProbeForWriteUlong(ReturnLength); *ReturnLength = sizeof(*DebugInfo); } _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) { + /* Get SEH Exception code */ Status = _SEH_GetExceptionCode(); } _SEH_END; @@ -1108,11 +1321,13 @@ /* Clear the initial wait state change structure */ RtlZeroMemory(&WaitStateChange, sizeof(WaitStateChange)); - /* Check if we came with a timeout from user mode */ + /* Check if the call was from user mode */ if (PreviousMode != KernelMode) { + /* Protect probe in SEH */ _SEH_TRY { + /* Check if we came with a timeout */ if (Timeout) { /* Make a copy on the stack */ @@ -1120,6 +1335,7 @@ Timeout = &SafeTimeOut; } + /* Probe the state change structure */ ProbeForWrite(StateChange, sizeof(*StateChange), sizeof(ULONG)); } _SEH_HANDLE @@ -1279,19 +1495,22 @@ /* We're, dereference the object */ ObDereferenceObject(DebugObject); - /* Return our wait state change structure */ + /* Protect write with SEH */ _SEH_TRY { - RtlCopyMemory(StateChange, + /* Return our wait state change structure */ + RtlMoveMemory(StateChange, &WaitStateChange, sizeof(DBGUI_WAIT_STATE_CHANGE)); } _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) { + /* Get SEH Exception code */ Status = _SEH_GetExceptionCode(); } _SEH_END; + /* Return status */ return Status; }

1 0

[janderwald] 24594: - quit sysreg when checkpoint USETUP_COMPLETED is reached
by janderwald＠svn.reactos.org 21 Oct '06

21 Oct '06

Author: janderwald Date: Sat Oct 21 21:59:15 2006 New Revision: 24594 URL: http://svn.reactos.org/svn/reactos?rev=24594&view=rev Log: - quit sysreg when checkpoint USETUP_COMPLETED is reached Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp 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 Sat Oct 21 21:59:15 2006 @@ -137,6 +137,21 @@ cerr << line << endl; + if (line.find (_T("SYSREG_CHECKPOINT")) != string::npos) + { + line.erase (0, line.find (_T("SYSREG_CHECKPOINT")) + 19); + if (!_tcsncmp(line.c_str (), _T("USETUP_COMPLETE"), 15)) + { + /// + /// we need to stop the emulator to avoid + /// looping again into USETUP (at least with bootcdregtest) + + return false; + } + + } + + if (line.find (_T("*** Fatal System Error")) != string::npos) { cerr << "BSOD detected" <<endl;

1 0

[janderwald] 24593: - add an option to store emulators pidfile in txt - destroy emulator process when sysreg exits (windows only currently) - the tool now works in windows
by janderwald＠svn.reactos.org 21 Oct '06

21 Oct '06

Author: janderwald Date: Sat Oct 21 20:12:42 2006 New Revision: 24593 URL: http://svn.reactos.org/svn/reactos?rev=24593&view=rev Log: - add an option to store emulators pidfile in txt - destroy emulator process when sysreg exits (windows only currently) - the tool now works in windows Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp trunk/reactos/tools/sysreg/rosboot_test.h trunk/reactos/tools/sysreg/sample.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 Sat Oct 21 20:12:42 2006 @@ -22,6 +22,10 @@ #include <assert.h> +#ifndef __LINUX__ +#include <windows.h> +#endif + namespace Sysreg_ { @@ -48,6 +52,7 @@ string RosBootTest::DEBUG_PORT = _T("ROSBOOT_DEBUG_PORT"); string RosBootTest::DEBUG_FILE = _T("ROSBOOT_DEBUG_FILE"); string RosBootTest::TIME_OUT = _T("ROSBOOT_TIME_OUT"); + string RosBootTest::PID_FILE= _T("ROSBOOT_PID_FILE"); //--------------------------------------------------------------------------------------- RosBootTest::RosBootTest() : RegressionTest(RosBootTest::CLASS_NAME), m_Timeout(60.0) @@ -90,6 +95,9 @@ m_Timeout = 60.0; } } + + conf_parser.getStringValue (RosBootTest::PID_FILE, m_PidFile); + if (!_tcscmp(debug_port.c_str(), _T("pipe"))) { @@ -118,11 +126,6 @@ //--------------------------------------------------------------------------------------- bool RosBootTest::checkDebugData(vector<string> & debug_data) { - /// - /// FIXME - /// - /// parse debug_data and output STOP errors, UM exception - /// as well as important stages i.e. ntoskrnl loaded /// TBD the information needs to be written into an provided log object /// which writes the info into HTML/log / sends etc .... @@ -131,6 +134,8 @@ for(size_t i = 0; i < debug_data.size();i++) { string line = debug_data[i]; + + cerr << line << endl; if (line.find (_T("*** Fatal System Error")) != string::npos) { @@ -186,7 +191,7 @@ } - if (clear) + if (clear && debug_data.size () > 5) { debug_data.clear (); } @@ -258,18 +263,33 @@ { PipeReader pipe_reader; -#if 0 _tremove(debug_log.c_str ()); + _tremove(m_PidFile.c_str ()); if (!pipe_reader.openPipe(boot_cmd, string(_T("rt")))) { cerr << "Error: failed to open pipe with cmd: " << boot_cmd << endl; return false; } -#endif // FIXXME // give the emulator some time to load freeloadr _sleep( (clock_t)4 * CLOCKS_PER_SEC ); + int pid = 0; + + if (m_PidFile != _T("")) + { + FILE * pidfile = _tfopen(m_PidFile.c_str (), _T("rt")); + if (pidfile) + { + TCHAR szBuffer[20]; + if (_fgetts(szBuffer, sizeof(szBuffer) / sizeof(TCHAR), pidfile)) + { + pid = _ttoi(szBuffer); + } + + } + fclose(pidfile); + } FILE * file = _tfopen(debug_log.c_str (), _T("rt")); if (!file) @@ -279,19 +299,34 @@ return false; } - TCHAR szBuffer[150]; + TCHAR szBuffer[1000]; bool ret = true; vector<string> vect; -#if 0 + while(!pipe_reader.isEof ()) -#else - while(!feof(file)) -#endif { if (_fgetts(szBuffer, sizeof(szBuffer) / sizeof(TCHAR), file)) { + string line = szBuffer; - vect.push_back (line); + + while(line.find (_T("\x10")) != string::npos) + { + line.erase(line.find(_T("\x10")), 1); + } + + if (line[0] != _T('(') && vect.size() >=1) + { + string prev = vect[vect.size () -1]; + prev.insert (prev.length ()-1, line); + vect.pop_back (); + vect.push_back (prev); + + } + else + { + vect.push_back (line); + } if (!checkDebugData(vect)) { @@ -304,9 +339,21 @@ } } } -#if 0 - pipe_reader.closePipe (); + fclose(file); + if (pid) + { +#ifdef __LINUX__ + +#else + HANDLE hProcess = OpenProcess(PROCESS_TERMINATE, FALSE, pid); + if (hProcess) + { + TerminateProcess(hProcess, 0); + } + CloseHandle(hProcess); #endif + } + pipe_reader.closePipe (); return ret; } 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 Sat Oct 21 20:12:42 2006 @@ -33,6 +33,7 @@ static string DEBUG_PORT; static string DEBUG_FILE; static string TIME_OUT; + static string PID_FILE; //--------------------------------------------------------------------------------------- /// @@ -116,6 +117,7 @@ protected: double m_Timeout; + string m_PidFile; }; // end of class RosBootTest Modified: 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 Sat Oct 21 20:12:42 2006 @@ -27,7 +27,15 @@ ; This value is the command which is executed to gain debugging data ; this value is mandatory -ROSBOOT_CMD=D:\sysreg\qemu\qemu.exe -serial file:debug.log -boot c -m 128 -L D:\sysreg\qemu\ D:\sysreg\qemu\RosVM.vmdk -cdrom D:\Reactos\ReactOS-RegTest.iso +ROSBOOT_CMD=D:\sysreg\qemu\qemu.exe -serial file:debug.log -boot c -m 128 -L D:\sysreg\qemu\ D:\sysreg\qemu\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 @@ -49,7 +57,7 @@ ; ROSBOOT_DEBUG_PORT=file ;ROSBOOT_DEBUG_FILE=D:\ReactOS\tools\sysreg\bsdebug.log -ROSBOOT_DEBUG_FILE=D:\ReactOS\tools\sysreg\umdebug.log +ROSBOOT_DEBUG_FILE=D:\ReactOS\tools\sysreg\debug.log ; ROSBOOT_TIME_OUT ;

1 0

[weiden] 24592: Remove the no longer used kjs library
by weiden＠svn.reactos.org 21 Oct '06

21 Oct '06

Author: weiden Date: Sat Oct 21 20:00:44 2006 New Revision: 24592 URL: http://svn.reactos.org/svn/reactos?rev=24592&view=rev Log: Remove the no longer used kjs library Removed: trunk/reactos/include/reactos/libs/libs/ trunk/reactos/lib/kjs/ Modified: trunk/reactos/lib/lib.rbuild trunk/reactos/ntoskrnl/ntoskrnl.rbuild Modified: trunk/reactos/lib/lib.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/lib.rbuild?rev=24592&r… ============================================================================== --- trunk/reactos/lib/lib.rbuild (original) +++ trunk/reactos/lib/lib.rbuild Sat Oct 21 20:00:44 2006 @@ -27,9 +27,6 @@ </directory> <directory name="intrlck"> <xi:include href="intrlck/intrlck.rbuild" /> -</directory> -<directory name="kjs"> - <xi:include href="kjs/kjs.rbuild" /> </directory> <directory name="libwine"> <xi:include href="libwine/libwine.rbuild" /> Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rbuild Sat Oct 21 20:00:44 2006 @@ -9,13 +9,11 @@ <define name="__NO_CTYPE_INLINES" /> <define name="__USE_W32API" /> <define name="WIN9X_COMPAT_SPINLOCK" /> - <include base="kjs">include</include> <include base="cmlib">.</include> <include base="ntoskrnl">include</include> <include base="ReactOS">include/reactos/drivers</include> <library>csq</library> <library>hal</library> - <library>kjs</library> <library>pseh</library> <library>cmlib</library> <library>rtl</library>

1 0

[janderwald] 24591: - set svn-eol:style property
by janderwald＠svn.reactos.org 21 Oct '06

21 Oct '06

Author: janderwald Date: Sat Oct 21 12:56:23 2006 New Revision: 24591 URL: http://svn.reactos.org/svn/reactos?rev=24591&view=rev Log: - set svn-eol:style property Modified: trunk/reactos/tools/sysreg/sample.cfg (contents, props changed) Modified: 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 Sat Oct 21 12:56:23 2006 @@ -1,62 +1,62 @@ -; 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 file:debug.log -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=pipe -ROSBOOT_DEBUG_PORT=file - -; -; 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\umdebug.log - -; 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; -; -; If the variable is not set, the default timeout is 1 minute -; -ROSBOOT_TIME_OUT=180.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 file:debug.log -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=pipe +ROSBOOT_DEBUG_PORT=file + +; +; 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\umdebug.log + +; 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; +; +; If the variable is not set, the default timeout is 1 minute +; +ROSBOOT_TIME_OUT=180.0 + Propchange: trunk/reactos/tools/sysreg/sample.cfg ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[janderwald] 24590: - provide a sample configuration file - allow other address line resolver than addr2line
by janderwald＠svn.reactos.org 21 Oct '06

21 Oct '06

Author: janderwald Date: Sat Oct 21 12:55:34 2006 New Revision: 24590 URL: http://svn.reactos.org/svn/reactos?rev=24590&view=rev Log: - provide a sample configuration file - allow other address line resolver than addr2line Added: trunk/reactos/tools/sysreg/sample.cfg Modified: trunk/reactos/tools/sysreg/sym_file.cpp Added: 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 (added) +++ trunk/reactos/tools/sysreg/sample.cfg Sat Oct 21 12:55:34 2006 @@ -1,0 +1,62 @@ +; 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 file:debug.log -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=pipe +ROSBOOT_DEBUG_PORT=file + +; +; 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\umdebug.log + +; 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; +; +; If the variable is not set, the default timeout is 1 minute +; +ROSBOOT_TIME_OUT=180.0 + 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 Sat Oct 21 12:55:34 2006 @@ -172,7 +172,7 @@ TCHAR szCmd[300]; - _stprintf(szCmd, _T("%s --exe=%s %s"), m_SymResolver.c_str (), it->second.c_str (), module_address.c_str()); + _stprintf(szCmd, _T("%s %s %s"), m_SymResolver.c_str (), it->second.c_str (), module_address.c_str()); string pipe_cmd(szCmd); PipeReader pipe_reader;

1 0

[janderwald] 24589: - give sysreg a makefile - allow compilation with gcc 4.1.1 - temporary disable execution of emulator command - lets start testing :)
by janderwald＠svn.reactos.org 21 Oct '06

21 Oct '06

Author: janderwald Date: Sat Oct 21 12:34:00 2006 New Revision: 24589 URL: http://svn.reactos.org/svn/reactos?rev=24589&view=rev Log: - give sysreg a makefile - allow compilation with gcc 4.1.1 - temporary disable execution of emulator command - lets start testing :) Added: trunk/reactos/tools/sysreg/sysreg.mak (with props) Modified: trunk/reactos/tools/sysreg/comp_factory.h trunk/reactos/tools/sysreg/pipe_reader.cpp trunk/reactos/tools/sysreg/reg_test.h trunk/reactos/tools/sysreg/rosboot_test.cpp trunk/reactos/tools/sysreg/sym_file.cpp trunk/reactos/tools/sysreg/sysreg.cpp trunk/reactos/tools/tools.mak Modified: trunk/reactos/tools/sysreg/comp_factory.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/comp_factory.… ============================================================================== --- trunk/reactos/tools/sysreg/comp_factory.h (original) +++ trunk/reactos/tools/sysreg/comp_factory.h Sat Oct 21 12:34:00 2006 @@ -18,7 +18,21 @@ { using std::map; using std::vector; - using std::endl; + +#ifdef UNICODE + + using std::wcout; + using std::endl; + +#define cout wcout; + +#else + + using std::cout; + using std::endl; + +#endif + //---------------------------------------------------------- /// /// ComponentFactoryTemplate Modified: trunk/reactos/tools/sysreg/pipe_reader.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/pipe_reader.c… ============================================================================== --- trunk/reactos/tools/sysreg/pipe_reader.cpp (original) +++ trunk/reactos/tools/sysreg/pipe_reader.cpp Sat Oct 21 12:34:00 2006 @@ -73,7 +73,7 @@ int res = _pclose(m_File); - if (res == UINT_MAX) + if (res == INT_MAX) { cerr << "Error: _pclose failed " <<endl; return false; 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 Sat Oct 21 12:34:00 2006 @@ -84,4 +84,4 @@ } // end of namespace Sysreg_ -#endif +#endif 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 Sat Oct 21 12:34:00 2006 @@ -258,13 +258,14 @@ { PipeReader pipe_reader; +#if 0 _tremove(debug_log.c_str ()); if (!pipe_reader.openPipe(boot_cmd, string(_T("rt")))) { cerr << "Error: failed to open pipe with cmd: " << boot_cmd << endl; return false; } - +#endif // FIXXME // give the emulator some time to load freeloadr _sleep( (clock_t)4 * CLOCKS_PER_SEC ); @@ -281,8 +282,11 @@ TCHAR szBuffer[150]; bool ret = true; vector<string> vect; - +#if 0 while(!pipe_reader.isEof ()) +#else + while(!feof(file)) +#endif { if (_fgetts(szBuffer, sizeof(szBuffer) / sizeof(TCHAR), file)) { @@ -300,9 +304,10 @@ } } } - +#if 0 pipe_reader.closePipe (); +#endif return ret; } -} // end of namespace Sysreg_ +} // end of namespace Sysreg_ 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 Sat Oct 21 12:34:00 2006 @@ -88,8 +88,8 @@ string val = current_dir; val.insert (val.length()-1, _T("\\*")); - struct _tfinddata64i32_t c_file; - intptr_t hFile = _tfindfirst64i32(val.c_str(), &c_file); + struct _tfinddatai64_t c_file; + intptr_t hFile = _tfindfirsti64(val.c_str(), &c_file); if (hFile == -1L) { @@ -130,7 +130,7 @@ } } - }while(_tfindnext(hFile, &c_file) == 0); + }while(_tfindnexti64(hFile, &c_file) == 0); _findclose(hFile); hFile = -1L; @@ -141,7 +141,7 @@ vect.erase (vect.begin()); val = current_dir; val.insert (val.length() -1, _T("\\*")); - hFile = _tfindfirst64i32(val.c_str(), &c_file); + hFile = _tfindfirsti64(val.c_str(), &c_file); if (hFile != -1L) { break; @@ -208,4 +208,4 @@ return true; } -} // end of namespace System_ +} // end of namespace System_ 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 Sat Oct 21 12:34:00 2006 @@ -23,6 +23,7 @@ #else using std::cerr; + using std::cout; using std::endl; #endif @@ -95,4 +96,4 @@ } return 0; -} +} Added: trunk/reactos/tools/sysreg/sysreg.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sysreg.mak?re… ============================================================================== --- trunk/reactos/tools/sysreg/sysreg.mak (added) +++ trunk/reactos/tools/sysreg/sysreg.mak Sat Oct 21 12:34:00 2006 @@ -1,0 +1,72 @@ +SYSREGBUILD_BASE = $(TOOLS_BASE)$(SEP)sysreg +SYSREGBUILD_BASE_ = $(SYSREGBUILD_BASE)$(SEP) +SYSREGBUILD_INT = $(INTERMEDIATE_)$(SYSREGBUILD_BASE) +SYSREGBUILD_INT_ = $(SYSREGBUILD_INT)$(SEP) +SYSREGBUILD_OUT = $(OUTPUT_)$(SYSREGBUILD_BASE) +SYSREGBUILD_OUT_ = $(SYSREGBUILD_OUT)$(SEP) + +$(SYSREGBUILD_INT): | $(TOOLS_INT) + $(ECHO_MKDIR) + ${mkdir} $@ + +ifneq ($(INTERMEDIATE),$(OUTPUT)) +$(SYSREGBUILD_OUT): | $(TOOLS_OUT) + $(ECHO_MKDIR) + ${mkdir} $@ +endif + +SYSREGBUILD_TARGET = \ + $(EXEPREFIX)$(SYSREGBUILD_OUT_)sysreg$(EXEPOSTFIX) + +SYSREGBUILD_SOURCES = $(addprefix $(SYSREGBUILD_BASE_),\ + conf_parser.cpp \ + env_var.cpp \ + pipe_reader.cpp \ + rosboot_test.cpp \ + sym_file.cpp \ + sysreg.cpp \ + ) + +SYSREGBUILD_OBJECTS = \ + $(addprefix $(INTERMEDIATE_), $(SYSREGBUILD_SOURCES:.cpp=.o)) + +SYSREGBUILD_HOST_CFLAGS = $(TOOLS_CPPFLAGS) -D__USE_W32API -Iinclude -Iinclude/reactos -Iinclude/psdk + +SYSREGBUILD_HOST_LFLAGS = $(TOOLS_LFLAGS) + +.PHONY: sysreg +sysreg: $(SYSREGBUILD_TARGET) +host_gpp += -g + +$(SYSREGBUILD_TARGET): $(SYSREGBUILD_OBJECTS) | $(SYSREGBUILD_OUT) + $(ECHO_LD) + ${host_gpp} $(SYSREGBUILD_OBJECTS) $(SYSREGBUILD_HOST_LFLAGS) -o $@ + +$(SYSREGBUILD_INT_)conf_parser.o: $(SYSREGBUILD_BASE_)conf_parser.cpp | $(SYSREGBUILD_INT) + $(ECHO_CC) + ${host_gpp} $(SYSREGBUILD_HOST_CFLAGS) -c $< -o $@ + +$(SYSREGBUILD_INT_)env_var.o: $(SYSREGBUILD_BASE_)env_var.cpp | $(SYSREGBUILD_INT) + $(ECHO_CC) + ${host_gpp} $(SYSREGBUILD_HOST_CFLAGS) -c $< -o $@ + +$(SYSREGBUILD_INT_)pipe_reader.o: $(SYSREGBUILD_BASE_)pipe_reader.cpp | $(SYSREGBUILD_INT) + $(ECHO_CC) + ${host_gpp} $(SYSREGBUILD_HOST_CFLAGS) -c $< -o $@ + +$(SYSREGBUILD_INT_)rosboot_test.o: $(SYSREGBUILD_BASE_)rosboot_test.cpp | $(SYSREGBUILD_INT) + $(ECHO_CC) + ${host_gpp} $(SYSREGBUILD_HOST_CFLAGS) -c $< -o $@ + +$(SYSREGBUILD_INT_)sym_file.o: $(SYSREGBUILD_BASE_)sym_file.cpp | $(SYSREGBUILD_INT) + $(ECHO_CC) + ${host_gpp} $(SYSREGBUILD_HOST_CFLAGS) -c $< -o $@ + +$(SYSREGBUILD_INT_)sysreg.o: $(SYSREGBUILD_BASE_)sysreg.cpp | $(SYSREGBUILD_INT) + $(ECHO_CC) + ${host_gpp} $(SYSREGBUILD_HOST_CFLAGS) -c $< -o $@ + +.PHONY: sysregbuild_clean +sysreg_clean: + -@$(rm) $(SYSREGBUILD_TARGET) $(SYSREGBUILD_OBJECTS) 2>$(NUL) +clean: sysreg_clean Propchange: trunk/reactos/tools/sysreg/sysreg.mak ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/tools/tools.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/tools.mak?rev=24589&… ============================================================================== --- trunk/reactos/tools/tools.mak (original) +++ trunk/reactos/tools/tools.mak Sat Oct 21 12:34:00 2006 @@ -58,3 +58,4 @@ include tools/wmc/wmc.mak include tools/wpp/wpp.mak include tools/wrc/wrc.mak +include tools/sysreg/sysreg.mak

1 0

[janderwald] 24588: - implement a basic boot detection algorithm - sysreg can now recognize some user mode detection and blue screen of deaths - a few timing issues have to be sorted out in order make deployment ready
by janderwald＠svn.reactos.org 21 Oct '06

21 Oct '06

Author: janderwald Date: Sat Oct 21 04:13:52 2006 New Revision: 24588 URL: http://svn.reactos.org/svn/reactos?rev=24588&view=rev Log: - implement a basic boot detection algorithm - sysreg can now recognize some user mode detection and blue screen of deaths - a few timing issues have to be sorted out in order make deployment ready Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp trunk/reactos/tools/sysreg/rosboot_test.h trunk/reactos/tools/sysreg/sym_file.cpp trunk/reactos/tools/sysreg/sysreg.cpp 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 Sat Oct 21 04:13:52 2006 @@ -11,10 +11,17 @@ #include "rosboot_test.h" #include "pipe_reader.h" +#include "sym_file.h" #include <iostream> +#include <vector> #include <time.h> #include <float.h> +#include <stdio.h> +#include <stdlib.h> +#include <assert.h> + + namespace Sysreg_ { @@ -32,8 +39,9 @@ #endif - + using std::vector; using System_::PipeReader; + using System_::SymbolFile; string RosBootTest::VARIABLE_NAME = _T("ROSBOOT_CMD"); string RosBootTest::CLASS_NAME = _T("rosboot"); @@ -108,7 +116,7 @@ return ret; } //--------------------------------------------------------------------------------------- - bool RosBootTest::checkDebugData(string debug_data) + bool RosBootTest::checkDebugData(vector<string> & debug_data) { /// /// FIXME @@ -118,9 +126,71 @@ /// TBD the information needs to be written into an provided log object /// which writes the info into HTML/log / sends etc .... -// cerr << debug_data << endl; + bool clear = true; + + for(size_t i = 0; i < debug_data.size();i++) + { + string line = debug_data[i]; + + if (line.find (_T("*** Fatal System Error")) != string::npos) + { + cerr << "BSOD detected" <<endl; + return false; + } + else if (line.find (_T("Unhandled exception")) != string::npos) + { + if (i + 3 >= debug_data.size ()) + { + /// + /// missing information is cut off -> try reconstruct at next call + /// + clear = false; + break; + } + + cerr << "UM detected" <<endl; + + /// + /// extract address from next line + /// + + string address = debug_data[i+2]; + string::size_type pos = address.find_last_of (_T(" ")); + address = address.substr (pos, address.length () - 1 - pos); + + /// + /// extract module name + /// + string modulename = debug_data[i+3]; + pos = modulename.find_last_of (_T("\\")); + modulename = modulename.substr (pos + 1, modulename.length () - pos); + pos = modulename.find_last_of (_T(".")); + modulename = modulename.substr (0, pos); + + /// + /// resolve address + /// + string result; + result.reserve (200); + + SymbolFile::resolveAddress (modulename, address, result); + cerr << result << endl; + + /// + /// TODO + /// + /// resolve frame addresses + + return false; + } + + } + + if (clear) + { + debug_data.clear (); + } return true; - } //--------------------------------------------------------------------------------------- bool RosBootTest::isTimeout(double max_timeout) @@ -150,7 +220,6 @@ //--------------------------------------------------------------------------------------- bool RosBootTest::fetchDebugByPipe(string boot_cmd) { - struct timeval ts; PipeReader pipe_reader; if (!pipe_reader.openPipe(boot_cmd, string(_T("rt")))) @@ -159,9 +228,10 @@ return false; } string Buffer; - Buffer.reserve (10000); + Buffer.reserve (500); bool ret = true; + vector<string> vect; while(!pipe_reader.isEof ()) { @@ -170,11 +240,11 @@ break; } - string::size_type size = pipe_reader.readPipe (Buffer); - cerr << "XXXsize_type " << size <<endl; - - - if (!checkDebugData(Buffer)) + pipe_reader.readPipe (Buffer); + vect.push_back (Buffer); + + + if (!checkDebugData(vect)) { ret = false; break; @@ -194,6 +264,12 @@ cerr << "Error: failed to open pipe with cmd: " << boot_cmd << endl; return false; } + + // FIXXME + // give the emulator some time to load freeloadr + _sleep( (clock_t)4 * CLOCKS_PER_SEC ); + + FILE * file = _tfopen(debug_log.c_str (), _T("rt")); if (!file) { @@ -202,15 +278,18 @@ return false; } - TCHAR szBuffer[500]; + TCHAR szBuffer[150]; bool ret = true; + vector<string> vect; while(!pipe_reader.isEof ()) { if (_fgetts(szBuffer, sizeof(szBuffer) / sizeof(TCHAR), file)) { - string buffer = szBuffer; - if (!checkDebugData(buffer)) + string line = szBuffer; + vect.push_back (line); + + if (!checkDebugData(vect)) { ret = false; break; 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 Sat Oct 21 04:13:52 2006 @@ -12,10 +12,12 @@ #include "reg_test.h" -#include <winsock2.h> +#include <vector> namespace Sysreg_ { + using std::vector; + //--------------------------------------------------------------------------------------- /// /// class RosBootTest @@ -100,7 +102,7 @@ /// Note: the received debug information should be written to an internal log object /// to facilate post-processing of the results - bool checkDebugData(string debug_data); + bool checkDebugData(vector<string> & debug_data); //--------------------------------------------------------------------------------------- /// 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 Sat Oct 21 04:13:52 2006 @@ -170,14 +170,11 @@ return false; } - string pipe_cmd = m_SymResolver; - pipe_cmd += _T("--exe="); - pipe_cmd += it->second; - - pipe_cmd += _T(" "); - pipe_cmd += module_address; - - + TCHAR szCmd[300]; + + _stprintf(szCmd, _T("%s --exe=%s %s"), m_SymResolver.c_str (), it->second.c_str (), module_address.c_str()); + string pipe_cmd(szCmd); + PipeReader pipe_reader; if (!pipe_reader.openPipe (pipe_cmd)) 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 Sat Oct 21 04:13:52 2006 @@ -91,7 +91,7 @@ } else { - cout << "The regression test " << regtest->getName () << "failed" << endl; + cout << "The regression test " << regtest->getName () << " failed" << endl; } return 0;

1 0

[janderwald] 24587: - use timeout to define maximum runtime of emulator
by janderwald＠svn.reactos.org 20 Oct '06

20 Oct '06

Author: janderwald Date: Sat Oct 21 01:14:08 2006 New Revision: 24587 URL: http://svn.reactos.org/svn/reactos?rev=24587&view=rev Log: - use timeout to define maximum runtime of emulator Modified: trunk/reactos/tools/sysreg/pipe_reader.cpp trunk/reactos/tools/sysreg/pipe_reader.h trunk/reactos/tools/sysreg/rosboot_test.cpp trunk/reactos/tools/sysreg/rosboot_test.h trunk/reactos/tools/sysreg/sym_file.cpp Modified: trunk/reactos/tools/sysreg/pipe_reader.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/pipe_reader.c… ============================================================================== --- trunk/reactos/tools/sysreg/pipe_reader.cpp (original) +++ trunk/reactos/tools/sysreg/pipe_reader.cpp Sat Oct 21 01:14:08 2006 @@ -85,7 +85,7 @@ //--------------------------------------------------------------------------------------- - bool PipeReader::isEof() const + bool PipeReader::isEof() { return feof(m_File); } Modified: trunk/reactos/tools/sysreg/pipe_reader.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/pipe_reader.h… ============================================================================== --- trunk/reactos/tools/sysreg/pipe_reader.h (original) +++ trunk/reactos/tools/sysreg/pipe_reader.h Sat Oct 21 01:14:08 2006 @@ -103,7 +103,7 @@ /// Description: returns true if the pipe has reached end of file. The caller should call /// closePipe if this function returns true - bool isEof() const; + bool isEof(); protected: FILE * m_File; 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 Sat Oct 21 01:14:08 2006 @@ -13,6 +13,8 @@ #include "pipe_reader.h" #include <iostream> +#include <time.h> +#include <float.h> namespace Sysreg_ { @@ -37,8 +39,10 @@ string RosBootTest::CLASS_NAME = _T("rosboot"); string RosBootTest::DEBUG_PORT = _T("ROSBOOT_DEBUG_PORT"); string RosBootTest::DEBUG_FILE = _T("ROSBOOT_DEBUG_FILE"); -//--------------------------------------------------------------------------------------- - RosBootTest::RosBootTest() : RegressionTest(RosBootTest::CLASS_NAME) + string RosBootTest::TIME_OUT = _T("ROSBOOT_TIME_OUT"); + +//--------------------------------------------------------------------------------------- + RosBootTest::RosBootTest() : RegressionTest(RosBootTest::CLASS_NAME), m_Timeout(60.0) { } @@ -54,6 +58,7 @@ { string boot_cmd; string debug_port; + string timeout; bool ret; if (!conf_parser.getStringValue (RosBootTest::DEBUG_PORT, debug_port)) @@ -66,7 +71,18 @@ cerr << "Error: ROSBOOT_CMD is not set in configuration file" << endl; return false; } - + + if (conf_parser.getStringValue(RosBootTest::TIME_OUT, timeout)) + { + TCHAR * stop; + m_Timeout = _tcstod(timeout.c_str (), &stop); + if (_isnan(m_Timeout) || m_Timeout == 0.0) + { + cerr << "Warning: overriding timeout with default of 60 sec" << endl; + m_Timeout = 60.0; + } + } + if (!_tcscmp(debug_port.c_str(), _T("pipe"))) { ret = fetchDebugByPipe(boot_cmd); @@ -102,8 +118,33 @@ /// TBD the information needs to be written into an provided log object /// which writes the info into HTML/log / sends etc .... - cerr << debug_data << endl; +// cerr << debug_data << endl; return true; + + } +//--------------------------------------------------------------------------------------- + bool RosBootTest::isTimeout(double max_timeout) + { + static time_t start = 0; + + if (!start) + { + time(&start); + return false; + } + + time_t stop; + time(&stop); + + double elapsed = difftime(stop, start); + if (elapsed > max_timeout) + { + return true; + } + else + { + return false; + } } //--------------------------------------------------------------------------------------- @@ -120,26 +161,34 @@ string Buffer; Buffer.reserve (10000); -// gettimeofday(&ts, NULL); + bool ret = true; while(!pipe_reader.isEof ()) { - pipe_reader.readPipe (Buffer); + if (isTimeout(m_Timeout)) + { + break; + } + + string::size_type size = pipe_reader.readPipe (Buffer); + cerr << "XXXsize_type " << size <<endl; + + if (!checkDebugData(Buffer)) { + ret = false; break; } - //if (hasTimeout(&ts, 60000) - } pipe_reader.closePipe (); - return true; + return ret; } //--------------------------------------------------------------------------------------- bool RosBootTest::fetchDebugByFile(Sysreg_::string boot_cmd, Sysreg_::string debug_log) { PipeReader pipe_reader; + _tremove(debug_log.c_str ()); if (!pipe_reader.openPipe(boot_cmd, string(_T("rt")))) { cerr << "Error: failed to open pipe with cmd: " << boot_cmd << endl; @@ -154,21 +203,27 @@ } TCHAR szBuffer[500]; - - do + bool ret = true; + + while(!pipe_reader.isEof ()) { if (_fgetts(szBuffer, sizeof(szBuffer) / sizeof(TCHAR), file)) { string buffer = szBuffer; if (!checkDebugData(buffer)) { + ret = false; break; } - } - }while(!pipe_reader.isEof ()); + if (isTimeout(m_Timeout)) + { + break; + } + } + } pipe_reader.closePipe (); - return true; + return ret; } } // end of namespace Sysreg_ 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 Sat Oct 21 01:14:08 2006 @@ -30,6 +30,7 @@ static string CLASS_NAME; static string DEBUG_PORT; static string DEBUG_FILE; + static string TIME_OUT; //--------------------------------------------------------------------------------------- /// @@ -101,15 +102,20 @@ bool checkDebugData(string debug_data); - }; // end of class RosBootTest - //--------------------------------------------------------------------------------------- /// /// checkTimeOut /// -/// Description: this function checks if the the application has already hung +/// Description: this function checks if the ReactOS has run longer than the maximum available +/// time - bool checkTimeOut(struct timeval * ts, unsigned max_timeout); + bool isTimeout(double max_timeout); + +protected: + + double m_Timeout; + + }; // end of class RosBootTest } // end of namespace Sysreg_ 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 Sat Oct 21 01:14:08 2006 @@ -114,7 +114,7 @@ path.insert (path.length () -1, _T("\\")); path.insert (path.length () -1, filename); - cerr << "Module Name " << modulename << endl << "File Name " << filename << endl; + cerr << "Module Name " << modulename << endl << "File Name " << path << endl; m_Map.insert(std::make_pair<string, string>(modulename, path));

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