Ros-diffs August 2008

ros-diffs@reactos.org

27 participants
853 discussions

[sginsberg] 35293: - Fix a typo in PsTerminateSystemThread. Now this API will actually terminate system threads.
by sginsberg＠svn.reactos.org 12 Aug '08

12 Aug '08

Author: sginsberg Date: Tue Aug 12 16:40:06 2008 New Revision: 35293 URL: http://svn.reactos.org/svn/reactos?rev=35293&view=rev Log: - Fix a typo in PsTerminateSystemThread. Now this API will actually terminate system threads. Modified: trunk/reactos/ntoskrnl/ps/kill.c Modified: trunk/reactos/ntoskrnl/ps/kill.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/kill.c?rev=352… ============================================================================== --- trunk/reactos/ntoskrnl/ps/kill.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/kill.c [iso-8859-1] Tue Aug 12 16:40:06 2008 @@ -1086,7 +1086,7 @@ PETHREAD Thread = PsGetCurrentThread(); /* Make sure this is a system thread */ - if (Thread->SystemThread) return STATUS_INVALID_PARAMETER; + if (!Thread->SystemThread) return STATUS_INVALID_PARAMETER; /* Terminate it for real */ return PspTerminateThreadByPointer(Thread, ExitStatus, TRUE);

1 0

[cgutman] 35292: - Check for FCB->TdiDeviceName.Buffer before attempting to access it - Fix 2 more memory leaks
by cgutman＠svn.reactos.org 12 Aug '08

12 Aug '08

Author: cgutman Date: Tue Aug 12 15:03:53 2008 New Revision: 35292 URL: http://svn.reactos.org/svn/reactos?rev=35292&view=rev Log: - Check for FCB->TdiDeviceName.Buffer before attempting to access it - Fix 2 more memory leaks Modified: branches/aicom-network-fixes/drivers/network/afd/afd/main.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/main.c [iso-8859-1] Tue Aug 12 15:03:53 2008 @@ -114,9 +114,6 @@ FCB->TdiDeviceName.MaximumLength = FCB->TdiDeviceName.Length; FCB->TdiDeviceName.Buffer = ExAllocatePool( NonPagedPool, FCB->TdiDeviceName.Length ); - RtlCopyMemory( FCB->TdiDeviceName.Buffer, - ConnectInfo->TransportName, - FCB->TdiDeviceName.Length ); if( !FCB->TdiDeviceName.Buffer ) { ExFreePool(FCB); @@ -125,6 +122,10 @@ IoCompleteRequest( Irp, IO_NETWORK_INCREMENT ); return STATUS_NO_MEMORY; } + + RtlCopyMemory( FCB->TdiDeviceName.Buffer, + ConnectInfo->TransportName, + FCB->TdiDeviceName.Length ); AFD_DbgPrint(MID_TRACE,("Success: %s %wZ\n", EaInfo->EaName, &FCB->TdiDeviceName)); @@ -192,6 +193,9 @@ InFlightRequest[i]->InFlightRequest->IoStatus.Status = STATUS_CANCELLED; InFlightRequest[i]->InFlightRequest->IoStatus.Information = 0; IoCancelIrp( InFlightRequest[i]->InFlightRequest ); + InFlightRequest[i]->InFlightRequest = NULL; + if( InFlightRequest[i]->ConnectionCallInfo ) ExFreePool( InFlightRequest[i]->ConnectionCallInfo ); + if( InFlightRequest[i]->ConnectionReturnInfo ) ExFreePool( InFlightRequest[i]->ConnectionReturnInfo ); } }

1 0

[cgutman] 35291: - Free the MDL on failure - Use _SEH_YIELD
by cgutman＠svn.reactos.org 12 Aug '08

12 Aug '08

Author: cgutman Date: Tue Aug 12 13:34:07 2008 New Revision: 35291 URL: http://svn.reactos.org/svn/reactos?rev=35291&view=rev Log: - Free the MDL on failure - Use _SEH_YIELD Modified: branches/aicom-network-fixes/drivers/network/afd/afd/tdi.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/tdi.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/tdi.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/tdi.c [iso-8859-1] Tue Aug 12 13:34:07 2008 @@ -864,16 +864,11 @@ MmProbeAndLockPages(Mdl, KernelMode, IoModifyAccess); } _SEH_HANDLE { AFD_DbgPrint(MIN_TRACE, ("MmProbeAndLockPages() failed.\n")); + IoFreeMdl(Mdl); IoFreeIrp(*Irp); *Irp = NULL; - Status = STATUS_INSUFFICIENT_RESOURCES; + _SEH_YIELD(return STATUS_INSUFFICIENT_RESOURCES); } _SEH_END; - - if( !NT_SUCCESS(Status) ) { - IoFreeIrp(*Irp); - *Irp = NULL; - return Status; - } AFD_DbgPrint(MID_TRACE,("AFD>>> Got an MDL: %x\n", Mdl)); @@ -952,16 +947,11 @@ AFD_DbgPrint(MIN_TRACE, ("probe and lock done\n")); } _SEH_HANDLE { AFD_DbgPrint(MIN_TRACE, ("MmProbeAndLockPages() failed.\n")); + IoFreeMdl(Mdl); IoFreeIrp(*Irp); *Irp = NULL; - Status = STATUS_INSUFFICIENT_RESOURCES; + _SEH_YIELD(return STATUS_INSUFFICIENT_RESOURCES); } _SEH_END; - - if( !NT_SUCCESS(Status) ) { - IoFreeIrp(*Irp); - *Irp = NULL; - return Status; - } AFD_DbgPrint(MID_TRACE,("AFD>>> Got an MDL: %x\n", Mdl)); @@ -1055,6 +1045,7 @@ MmProbeAndLockPages(Mdl, KernelMode, IoModifyAccess); } _SEH_HANDLE { AFD_DbgPrint(MIN_TRACE, ("MmProbeAndLockPages() failed.\n")); + IoFreeMdl(Mdl); IoFreeIrp(*Irp); *Irp = NULL; _SEH_YIELD(return STATUS_INSUFFICIENT_RESOURCES); @@ -1153,6 +1144,7 @@ MmProbeAndLockPages(Mdl, KernelMode, IoModifyAccess); } _SEH_HANDLE { AFD_DbgPrint(MIN_TRACE, ("MmProbeAndLockPages() failed.\n")); + IoFreeMdl(Mdl); IoFreeIrp(*Irp); *Irp = NULL; _SEH_YIELD(return STATUS_INSUFFICIENT_RESOURCES);

1 0

[cgutman] 35290: - Make sure both FCB->Recv.Window and FCB->Send.Window were created before returning STATUS_SUCCESS - Make sure MakeSocketIntoConnection() completed successfully - Make sure WarmSocketForConnection() completed successfully - Don't continue if TdiBuildNullConnectionInfoInPlace() fails - SEHify TdiBuildConnectionInfoInPlace() - Make sure we have a non-NULL TargetAddress before calling TdiSendDatagram()
by cgutman＠svn.reactos.org 12 Aug '08

12 Aug '08

Author: cgutman Date: Tue Aug 12 13:18:03 2008 New Revision: 35290 URL: http://svn.reactos.org/svn/reactos?rev=35290&view=rev Log: - Make sure both FCB->Recv.Window and FCB->Send.Window were created before returning STATUS_SUCCESS - Make sure MakeSocketIntoConnection() completed successfully - Make sure WarmSocketForConnection() completed successfully - Don't continue if TdiBuildNullConnectionInfoInPlace() fails - SEHify TdiBuildConnectionInfoInPlace() - Make sure we have a non-NULL TargetAddress before calling TdiSendDatagram() Modified: branches/aicom-network-fixes/drivers/network/afd/afd/connect.c branches/aicom-network-fixes/drivers/network/afd/afd/listen.c branches/aicom-network-fixes/drivers/network/afd/afd/tdiconn.c branches/aicom-network-fixes/drivers/network/afd/afd/write.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/connect.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/connect.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/connect.c [iso-8859-1] Tue Aug 12 13:18:03 2008 @@ -33,26 +33,32 @@ } NTSTATUS MakeSocketIntoConnection( PAFD_FCB FCB ) { - NTSTATUS Status = STATUS_NO_MEMORY; + NTSTATUS Status; /* Allocate the receive area and start receiving */ FCB->Recv.Window = ExAllocatePool( NonPagedPool, FCB->Recv.Size ); + + if( !FCB->Recv.Window ) return STATUS_NO_MEMORY; + FCB->Send.Window = ExAllocatePool( NonPagedPool, FCB->Send.Size ); + if( !FCB->Send.Window ) { + ExFreePool( FCB->Recv.Window ); + return STATUS_NO_MEMORY; + } + FCB->State = SOCKET_STATE_CONNECTED; - if( FCB->Recv.Window ) { - Status = TdiReceive( &FCB->ReceiveIrp.InFlightRequest, - FCB->Connection.Object, - TDI_RECEIVE_NORMAL, - FCB->Recv.Window, - FCB->Recv.Size, - &FCB->ReceiveIrp.Iosb, - ReceiveComplete, - FCB ); - } + Status = TdiReceive( &FCB->ReceiveIrp.InFlightRequest, + FCB->Connection.Object, + TDI_RECEIVE_NORMAL, + FCB->Recv.Window, + FCB->Recv.Size, + &FCB->ReceiveIrp.Iosb, + ReceiveComplete, + FCB ); return Status; } @@ -102,8 +108,9 @@ if( NT_SUCCESS(Status) ) { Status = MakeSocketIntoConnection( FCB ); - if( FCB->Send.Window && - !IsListEmpty( &FCB->PendingIrpList[FUNCTION_SEND] ) ) { + if( !NT_SUCCESS(Status) ) return Status; + + if( !IsListEmpty( &FCB->PendingIrpList[FUNCTION_SEND] ) ) { NextIrpEntry = RemoveHeadList(&FCB->PendingIrpList[FUNCTION_SEND]); NextIrp = CONTAINING_RECORD(NextIrpEntry, IRP, Tail.Overlay.ListEntry); @@ -158,7 +165,7 @@ case SOCKET_STATE_CONNECTING: return LeaveIrpUntilLater( FCB, Irp, FUNCTION_CONNECT ); - case SOCKET_STATE_CREATED: { + case SOCKET_STATE_CREATED: FCB->LocalAddress = TaCopyTransportAddress( &ConnectReq->RemoteAddress ); @@ -182,7 +189,8 @@ } else return UnlockAndMaybeComplete ( FCB, STATUS_NO_MEMORY, Irp, 0, NULL ); - } /* Drop through to SOCKET_STATE_BOUND */ + + /* Drop through to SOCKET_STATE_BOUND */ case SOCKET_STATE_BOUND: FCB->RemoteAddress = Modified: branches/aicom-network-fixes/drivers/network/afd/afd/listen.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/listen.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/listen.c [iso-8859-1] Tue Aug 12 13:18:03 2008 @@ -182,9 +182,11 @@ Status = WarmSocketForConnection( FCB ); + AFD_DbgPrint(MID_TRACE,("Status from warmsocket %x\n", Status)); + + if( !NT_SUCCESS(Status) ) return UnlockAndMaybeComplete( FCB, Status, Irp, 0, NULL ); + FCB->State = SOCKET_STATE_LISTENING; - - AFD_DbgPrint(MID_TRACE,("Status from warmsocket %x\n", Status)); TdiBuildNullConnectionInfo ( &FCB->ListenIrp.ConnectionCallInfo, @@ -274,7 +276,7 @@ &FCB->ListenIrp.Iosb, ListenComplete, FCB ); - } + } else return UnlockAndMaybeComplete( FCB, Status, Irp, 0, NULL ); FCB->NeedsNewListen = FALSE; } Modified: branches/aicom-network-fixes/drivers/network/afd/afd/tdiconn.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/tdiconn.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/tdiconn.c [iso-8859-1] Tue Aug 12 13:18:03 2008 @@ -8,6 +8,7 @@ * 20040708 Created */ #include <afd.h> +#include <pseh/pseh.h> #include "debug.h" #include "tdiconn.h" @@ -126,9 +127,11 @@ Status = TdiBuildNullConnectionInfoInPlace( ConnInfo, Type ); - if (!NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status)) { ExFreePool( ConnInfo ); - else + *ConnectionInfo = NULL; + return Status; + } else *ConnectionInfo = ConnInfo; ConnInfo->RemoteAddress = (PTA_ADDRESS)&ConnInfo[1]; @@ -144,9 +147,13 @@ PTRANSPORT_ADDRESS Address ) { NTSTATUS Status = STATUS_SUCCESS; - RtlCopyMemory( ConnectionInfo->RemoteAddress, - Address, - ConnectionInfo->RemoteAddressLength ); + _SEH_TRY { + RtlCopyMemory( ConnectionInfo->RemoteAddress, + Address, + ConnectionInfo->RemoteAddressLength ); + } _SEH_HANDLE { + Status = _SEH_GetExceptionCode(); + } _SEH_END; return Status; } Modified: branches/aicom-network-fixes/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/write.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/write.c [iso-8859-1] Tue Aug 12 13:18:03 2008 @@ -233,21 +233,23 @@ TdiBuildConnectionInfo( &TargetAddress, FCB->RemoteAddress ); - SocketCalloutEnter( FCB ); - - Status = TdiSendDatagram - ( &FCB->SendIrp.InFlightRequest, - FCB->AddressFile.Object, - SendReq->BufferArray[0].buf, - SendReq->BufferArray[0].len, - TargetAddress, - &FCB->SendIrp.Iosb, - PacketSocketSendComplete, - FCB ); - - SocketCalloutLeave( FCB ); - - ExFreePool( TargetAddress ); + if( TargetAddress ) { + SocketCalloutEnter( FCB ); + + Status = TdiSendDatagram + ( &FCB->SendIrp.InFlightRequest, + FCB->AddressFile.Object, + SendReq->BufferArray[0].buf, + SendReq->BufferArray[0].len, + TargetAddress, + &FCB->SendIrp.Iosb, + PacketSocketSendComplete, + FCB ); + + SocketCalloutLeave( FCB ); + + ExFreePool( TargetAddress ); + } else Status = STATUS_NO_MEMORY; if( Status == STATUS_PENDING ) Status = STATUS_SUCCESS;

1 0

[cgutman] 35289: - Fix another memory leak
by cgutman＠svn.reactos.org 12 Aug '08

12 Aug '08

Author: cgutman Date: Tue Aug 12 10:27:15 2008 New Revision: 35289 URL: http://svn.reactos.org/svn/reactos?rev=35289&view=rev Log: - Fix another memory leak Modified: branches/aicom-network-fixes/drivers/network/afd/afd/main.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/main.c [iso-8859-1] Tue Aug 12 10:27:15 2008 @@ -207,6 +207,8 @@ ExFreePool( FCB->AddressFrom ); if( FCB->LocalAddress ) ExFreePool( FCB->LocalAddress ); + if( FCB->RemoteAddress ) + ExFreePool( FCB->RemoteAddress ); ExFreePool(FCB->TdiDeviceName.Buffer);

1 0

[cfinck] 35288: Attempt to fix release build (broken in r35285)
by cfinck＠svn.reactos.org 12 Aug '08

12 Aug '08

Author: cfinck Date: Tue Aug 12 09:48:51 2008 New Revision: 35288 URL: http://svn.reactos.org/svn/reactos?rev=35288&view=rev Log: Attempt to fix release build (broken in r35285) Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c [iso-8859-1] Tue Aug 12 09:48:51 2008 @@ -153,6 +153,8 @@ if (!InfGetDataField (&InfContext, 1, &DbgLoadOptions)) DbgLoadOptions = ""; } +#else + DbgLoadOptions = ""; #endif if (!strlen(DbgLoadOptions) && !InfFindFirstLine (InfHandle, "SetupData",

1 0

[arty] 35287: Processes and Threads view. Somewhat WIP.
by arty＠svn.reactos.org 12 Aug '08

12 Aug '08

Author: arty Date: Tue Aug 12 05:48:38 2008 New Revision: 35287 URL: http://svn.reactos.org/svn/reactos?rev=35287&view=rev Log: Processes and Threads view. Somewhat WIP. Added: trunk/tools/reactosdbg/RosDBG/ProcThread.Designer.cs trunk/tools/reactosdbg/RosDBG/ProcThread.cs trunk/tools/reactosdbg/RosDBG/ProcThread.resx Modified: trunk/tools/reactosdbg/DebugProtocol/DebugConnection.cs trunk/tools/reactosdbg/DebugProtocol/IDebugProtocol.cs trunk/tools/reactosdbg/DebugProtocol/KDBG.cs trunk/tools/reactosdbg/RosDBG/RegisterView.cs trunk/tools/reactosdbg/RosDBG/RosDBG.csproj Modified: trunk/tools/reactosdbg/DebugProtocol/DebugConnection.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/DebugProtocol/Deb… ============================================================================== --- trunk/tools/reactosdbg/DebugProtocol/DebugConnection.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/DebugProtocol/DebugConnection.cs [iso-8859-1] Tue Aug 12 05:48:38 2008 @@ -66,6 +66,35 @@ } public delegate void DebugRawTrafficEventHandler(object sender, DebugRawTrafficEventArgs args); + public class ThreadElement + { + bool mCurrent; + public bool Current { get { return mCurrent; } set { mCurrent = value; } } + ulong mTid; + public ulong ThreadId { get { return mTid; } set { mTid = value; } } + public ThreadElement(ulong tid, bool current) { mTid = tid; mCurrent = current; } + } + + public class ProcessElement + { + bool mCurrent; + public bool Current { get { return mCurrent; } set { mCurrent = value; } } + ulong mPid; + public ulong ProcessId { get { return mPid; } set { mPid = value; } } + public Dictionary<ulong, ThreadElement> Threads = new Dictionary<ulong,ThreadElement>(); + public ProcessElement(ulong pid, bool current) { mPid = pid; mCurrent = current; } + } + + public class DebugProcessThreadChangeEventArgs : EventArgs + { + public readonly Dictionary<ulong, ProcessElement> Processes; + public DebugProcessThreadChangeEventArgs(Dictionary<ulong, ProcessElement> processes) + { + Processes = processes; + } + } + public delegate void DebugProcessThreadChangeEventHandler(object sender, DebugProcessThreadChangeEventArgs args); + public class DebugConnection { #region Primary State @@ -80,7 +109,8 @@ DebugConnectionModeChangedEvent(this, new DebugConnectionModeChangedEventArgs(value)); } } - public bool mRunning = true; + + bool mRunning = true; public bool Running { get { return mRunning; } @@ -91,12 +121,30 @@ DebugRunningChangeEvent(this, new DebugRunningChangeEventArgs(value)); } } + + ulong mCurrentProcess; + public ulong CurrentProcess + { + get { return mCurrentProcess; } + set { mKdb.SetProcess(value); } + } + + ulong mCurrentThread; + public ulong CurrentThread + { + get { return mCurrentThread; } + set { mKdb.SetThread(value); } + } + KDBG mKdb; Registers mRegisters = new Registers(); + ulong mNewCurrentThread, mNewCurrentProcess; public IDebugProtocol Debugger { get { return mKdb; } } Pipe mMedium; Mode mConnectionMode; List<WeakReference> mMemoryReaders = new List<WeakReference>(); + Dictionary<ulong, ProcessElement> mProcesses = new Dictionary<ulong, ProcessElement>(); + Dictionary<ulong, ProcessElement> mAccumulateProcesses = new Dictionary<ulong, ProcessElement>(); #endregion #region Socket Mode State @@ -120,6 +168,7 @@ public event DebugConnectionModeChangedEventHandler DebugConnectionModeChangedEvent; public event DebugRunningChangeEventHandler DebugRunningChangeEvent; public event DebugModuleChangedEventHandler DebugModuleChangedEvent; + public event DebugProcessThreadChangeEventHandler DebugProcessThreadChangeEvent; public event DebugRawTrafficEventHandler DebugRawTrafficEvent; public DebugConnection() @@ -150,6 +199,16 @@ } } + void ConnectEventHandlers() + { + //set up tab handlers + mKdb.RegisterChangeEvent += RegisterChangeEvent; + mKdb.ModuleListEvent += ModuleListEvent; + mKdb.MemoryUpdateEvent += MemoryUpdateEvent; + mKdb.ProcessListEvent += ProcessListEvent; + mKdb.ThreadListEvent += ThreadListEvent; + } + public void Start(string host, int port) { Close(); @@ -166,6 +225,7 @@ public void Start(string pipeName) { Close(); + ConnectionMode = Mode.PipeMode; mNamedPipe = new NamedPipe(); mNamedPipe.Create(pipeName); mNamedPipe.Listen(); @@ -185,10 +245,7 @@ mMedium = new SerialPipe(mSerialPort); mMedium.PipeReceiveEvent += PipeReceiveEvent; mKdb = new KDBG(mMedium); - //set up tab handlers - mKdb.RegisterChangeEvent += RegisterChangeEvent; - mKdb.ModuleListEvent += ModuleListEvent; - mKdb.MemoryUpdateEvent += MemoryUpdateEvent; + ConnectEventHandlers(); Running = true; } catch (Exception) @@ -196,6 +253,46 @@ ConnectionMode = Mode.ClosedMode; //error signal? } + } + + void ProcessListEvent(object sender, ProcessListEventArgs args) + { + if (args.Reset) + { + mAccumulateProcesses.Clear(); + } + else if (args.End) + { + mKdb.GetThreads(mNewCurrentProcess); + } + else + mAccumulateProcesses[args.Pid] = new ProcessElement(args.Pid, args.Current); + + if (args.Current) + mNewCurrentProcess = args.Pid; + } + + void ThreadListEvent(object sender, ThreadListEventArgs args) + { + if (args.Reset) + { + mAccumulateProcesses[mNewCurrentProcess].Threads.Clear(); + } + else if (args.End) + { + mCurrentProcess = mNewCurrentProcess; + mCurrentThread = mNewCurrentThread; + mProcesses = mAccumulateProcesses; + if (DebugProcessThreadChangeEvent != null) + DebugProcessThreadChangeEvent(this, new DebugProcessThreadChangeEventArgs(mProcesses)); + } + else + { + mAccumulateProcesses[mNewCurrentProcess].Threads[args.Tid] = new ThreadElement(args.Tid, args.Current); + } + + if (args.Current) + mNewCurrentThread = args.Tid; } public void Close() @@ -238,9 +335,7 @@ mMedium.PipeErrorEvent += MediumError; mMedium.PipeReceiveEvent += PipeReceiveEvent; mKdb = new KDBG(mMedium); - mKdb.RegisterChangeEvent += RegisterChangeEvent; - mKdb.ModuleListEvent += ModuleListEvent; - mKdb.MemoryUpdateEvent += MemoryUpdateEvent; + ConnectEventHandlers(); Running = true; if (DebugConnectionConnectedEvent != null) DebugConnectionConnectedEvent(this, new DebugConnectedEventArgs()); @@ -315,6 +410,16 @@ } } + public void SetProcess(ulong pid) + { + mKdb.SetProcess(pid); + } + + public void SetThread(ulong tid) + { + mKdb.SetThread(tid); + } + public DebugMemoryStream NewMemoryStream() { lock (mMemoryReaders) Modified: trunk/tools/reactosdbg/DebugProtocol/IDebugProtocol.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/DebugProtocol/IDe… ============================================================================== --- trunk/tools/reactosdbg/DebugProtocol/IDebugProtocol.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/DebugProtocol/IDebugProtocol.cs [iso-8859-1] Tue Aug 12 05:48:38 2008 @@ -69,6 +69,28 @@ } } public delegate void ModuleListEventHandler(object sender, ModuleListEventArgs args); + + public class ProcessListEventArgs : EventArgs + { + public readonly bool Reset, Current, End; + public readonly ulong Pid; + public ProcessListEventArgs() { Reset = true; } + public ProcessListEventArgs(bool end) { End = true; } + public ProcessListEventArgs(ulong pid, bool current) { Current = current; Pid = pid; } + } + + public delegate void ProcessListEventHandler(object sender, ProcessListEventArgs args); + + public class ThreadListEventArgs : EventArgs + { + public readonly bool Reset, Current, End; + public readonly ulong Tid; + public ThreadListEventArgs() { Reset = true; } + public ThreadListEventArgs(bool end) { End = true; } + public ThreadListEventArgs(ulong tid, bool current) { Current = current; Tid = tid; } + } + + public delegate void ThreadListEventHandler(object sender, ThreadListEventArgs args); #endregion public interface IDebugProtocol @@ -82,16 +104,23 @@ event RemoteGDBErrorHandler RemoteGDBError; event MemoryUpdateEventHandler MemoryUpdateEvent; event ModuleListEventHandler ModuleListEvent; + event ProcessListEventHandler ProcessListEvent; + event ThreadListEventHandler ThreadListEvent; void GetRegisterUpdate(); void GetModuleUpdate(); void GetMemoryUpdate(ulong address, int len); + void GetProcesses(); + void GetThreads(ulong pid); void WriteMemory(ulong address, byte[] buf); void Step(); void Next(); void Break(); void Go(ulong address); + void SetProcess(ulong pid); + void SetThread(ulong tid); + void Write(string wr); void Close(); Modified: trunk/tools/reactosdbg/DebugProtocol/KDBG.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/DebugProtocol/KDB… ============================================================================== --- trunk/tools/reactosdbg/DebugProtocol/KDBG.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/DebugProtocol/KDBG.cs [iso-8859-1] Tue Aug 12 05:48:38 2008 @@ -38,10 +38,16 @@ static Regex mRegLineEBP = new Regex("EBP 0x(?<ebp>[0-9a-fA-F]+).*"); static Regex mRegLineEFLAGS = new Regex("EFLAGS 0x(?<eflags>[0-9a-fA-F]+).*"); static Regex mSregLine = new Regex("[CDEFGS]S 0x(?<seg>[0-9a-fA-F]+).*"); + static Regex mProcListHeading = new Regex("PID[ \\t]+State[ \\t]+Filename.*"); + static Regex mThreadListHeading = new Regex("TID[ \\t]+State[ \\t]+Prio.*"); + static Regex mProcListEntry = new Regex("^(?<cur>([*]|))0x(?<pid>[0-9a-fA-F]+)[ \\t]+(?<state>.*)"); + static Regex mThreadListEntry = new Regex("^(?<cur>([*]|))0x(?<tid>[0-9a-fA-F]+)[ \\t]+(?<state>.*)"); bool mFirstModuleUpdate = false; + bool mReceivingProcs = false; + bool mReceivingThreads = false; StringBuilder mInputBuffer = new StringBuilder(); - int usedInput; + int mUsedInput; void PipeReceiveEvent(object sender, PipeReceiveEventArgs args) { @@ -51,10 +57,10 @@ mInputBuffer.Append(args.Received); - if (mInputBuffer.ToString().Substring(usedInput).Contains("key to continue")) + if (mInputBuffer.ToString().Substring(mUsedInput).Contains("key to continue")) { mConnection.Write("\r"); - usedInput = mInputBuffer.Length; + mUsedInput = mInputBuffer.Length; } while ((promptIdx = (inbufStr = mInputBuffer.ToString()).IndexOf("kdb:> ")) != -1) @@ -64,7 +70,7 @@ int remove = pretext.Length + "kdb:> ".Length; mInputBuffer.Remove(0, remove); - usedInput = Math.Max(0, usedInput - remove); + mUsedInput = Math.Max(0, mUsedInput - remove); if (!tookText) { @@ -72,6 +78,7 @@ { mRunning = false; GetRegisterUpdate(); + GetProcesses(); } tookText = true; } @@ -83,7 +90,10 @@ { if (cleanedLine.StartsWith("Entered debugger on ")) { + mReceivingProcs = false; + mReceivingThreads = false; GetRegisterUpdate(); + GetProcesses(); continue; } @@ -149,7 +159,6 @@ mModuleList[moduleName.ToUpper()] = baseAddress; if (ModuleListEvent != null) ModuleListEvent(this, new ModuleListEventArgs(moduleName, baseAddress)); - continue; } @@ -170,6 +179,7 @@ ulong esp = ulong.Parse(ssEspMatch.Groups["esp"].ToString(), NumberStyles.HexNumber); mRegisters[4] = esp; mRegisters[15] = ss; + continue; } Match eaxEbxMatch = mRegLineEAX_EBX.Match(cleanedLine); @@ -228,7 +238,56 @@ } continue; } - } catch (Exception) { /* Error line ... we'll ignore it for now */ } + + Match pidHeadMatch = mProcListHeading.Match(cleanedLine); + if (pidHeadMatch.Success) + { + mReceivingThreads = false; + mReceivingProcs = true; + if (ProcessListEvent != null) + ProcessListEvent(this, new ProcessListEventArgs()); + continue; + } + else + { + Match pidEntryMatch = mProcListEntry.Match(cleanedLine); + if (pidEntryMatch.Success) + { + if (ProcessListEvent != null) + ProcessListEvent(this, new ProcessListEventArgs(ulong.Parse(pidEntryMatch.Groups["pid"].ToString(), NumberStyles.HexNumber), pidEntryMatch.Groups["cur"].Length > 0)); + } + else + { + if ((mReceivingProcs || cleanedLine.Contains("No processes")) && ProcessListEvent != null) + ProcessListEvent(this, new ProcessListEventArgs(true)); + } + } + + Match tidHeadMatch = mThreadListHeading.Match(cleanedLine); + if (tidHeadMatch.Success) + { + mReceivingThreads = true; + mReceivingProcs = false; + if (ThreadListEvent != null) + ThreadListEvent(this, new ThreadListEventArgs()); + continue; + } + else + { + Match tidEntryMatch = mThreadListEntry.Match(cleanedLine); + if (tidEntryMatch.Success) + { + if (ThreadListEvent != null) + ThreadListEvent(this, new ThreadListEventArgs(ulong.Parse(tidEntryMatch.Groups["tid"].ToString(), NumberStyles.HexNumber), tidEntryMatch.Groups["cur"].Length > 0)); + } + else + { + if (mReceivingThreads && ThreadListEvent != null) + ThreadListEvent(this, new ThreadListEventArgs(true)); + } + } + } + catch (Exception) { /* Error line ... we'll ignore it for now */ } } } @@ -260,6 +319,8 @@ public event RemoteGDBErrorHandler RemoteGDBError; public event MemoryUpdateEventHandler MemoryUpdateEvent; public event ModuleListEventHandler ModuleListEvent; + public event ProcessListEventHandler ProcessListEvent; + public event ThreadListEventHandler ThreadListEvent; public void GetRegisterUpdate() { @@ -299,6 +360,7 @@ QueueCommand("step"); GetRegisterUpdate(); GetModuleUpdate(); + GetProcesses(); } public void Next() @@ -306,6 +368,7 @@ QueueCommand("next"); GetRegisterUpdate(); GetModuleUpdate(); + GetProcesses(); } public void Break() @@ -322,6 +385,28 @@ QueueCommand("cont"); } + public void GetProcesses() + { + QueueCommand("proc list"); + } + + public void GetThreads(ulong pid) + { + QueueCommand(string.Format("thread list 0x{0:X8}", pid)); + } + + public void SetProcess(ulong pid) + { + QueueCommand(string.Format("proc attach 0x{0:X8}", pid)); + GetRegisterUpdate(); + } + + public void SetThread(ulong tid) + { + QueueCommand(string.Format("thread attach 0x{0:X8}", tid)); + GetRegisterUpdate(); + } + public void Write(string wr) { mConnection.Write(wr); } public void Close() Added: trunk/tools/reactosdbg/RosDBG/ProcThread.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/ProcThread… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/ProcThread.Designer.cs (added) +++ trunk/tools/reactosdbg/RosDBG/ProcThread.Designer.cs [iso-8859-1] Tue Aug 12 05:48:38 2008 @@ -1,0 +1,101 @@ +ï»¿namespace RosDBG +{ + partial class ProcThread + { + /// <summary> + /// Required designer variable. + /// </summary> + private System.ComponentModel.IContainer components = null; + + /// <summary> + /// Clean up any resources being used. + /// </summary> + /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param> + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Component Designer generated code + + /// <summary> + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// </summary> + private void InitializeComponent() + { + this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.Processes = new System.Windows.Forms.DataGridView(); + this.Threads = new System.Windows.Forms.DataGridView(); + this.splitContainer1.Panel1.SuspendLayout(); + this.splitContainer1.Panel2.SuspendLayout(); + this.splitContainer1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.Processes)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.Threads)).BeginInit(); + this.SuspendLayout(); + // + // splitContainer1 + // + this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer1.Location = new System.Drawing.Point(0, 0); + this.splitContainer1.Name = "splitContainer1"; + this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal; + // + // splitContainer1.Panel1 + // + this.splitContainer1.Panel1.Controls.Add(this.Processes); + // + // splitContainer1.Panel2 + // + this.splitContainer1.Panel2.Controls.Add(this.Threads); + this.splitContainer1.Size = new System.Drawing.Size(419, 349); + this.splitContainer1.SplitterDistance = 139; + this.splitContainer1.TabIndex = 0; + // + // Processes + // + this.Processes.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.Processes.Dock = System.Windows.Forms.DockStyle.Fill; + this.Processes.Location = new System.Drawing.Point(0, 0); + this.Processes.Name = "Processes"; + this.Processes.Size = new System.Drawing.Size(419, 139); + this.Processes.TabIndex = 0; + this.Processes.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.Processes_CellDoubleClick); + // + // Threads + // + this.Threads.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.Threads.Dock = System.Windows.Forms.DockStyle.Fill; + this.Threads.Location = new System.Drawing.Point(0, 0); + this.Threads.Name = "Threads"; + this.Threads.Size = new System.Drawing.Size(419, 206); + this.Threads.TabIndex = 0; + this.Threads.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.Threads_CellDoubleClick); + // + // ProcThread + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.splitContainer1); + this.Name = "ProcThread"; + this.Size = new System.Drawing.Size(419, 349); + this.splitContainer1.Panel1.ResumeLayout(false); + this.splitContainer1.Panel2.ResumeLayout(false); + this.splitContainer1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.Processes)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.Threads)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.SplitContainer splitContainer1; + private System.Windows.Forms.DataGridView Processes; + private System.Windows.Forms.DataGridView Threads; + } +} Added: trunk/tools/reactosdbg/RosDBG/ProcThread.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/ProcThread… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/ProcThread.cs (added) +++ trunk/tools/reactosdbg/RosDBG/ProcThread.cs [iso-8859-1] Tue Aug 12 05:48:38 2008 @@ -1,0 +1,66 @@ +ï»¿using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Drawing; +using System.Data; +using System.Linq; +using System.Text; +using System.Windows.Forms; +using DebugProtocol; + +namespace RosDBG +{ + [DebugControl, BuildAtStartup] + public partial class ProcThread : UserControl, IUseDebugConnection + { + DebugConnection mConnection; + Dictionary<ulong, ProcessElement> mProcesses = new Dictionary<ulong,ProcessElement>(); + + public ProcThread() + { + InitializeComponent(); + } + + public void SetDebugConnection(DebugConnection conn) + { + mConnection = conn; + mConnection.DebugProcessThreadChangeEvent += DebugProcessThreadChangeEvent; + } + + void DebugProcessThreadChangeEvent(object sender, DebugProcessThreadChangeEventArgs args) + { + mProcesses = args.Processes; + Invoke(Delegate.CreateDelegate(typeof(NoParamsDelegate), this, "RefreshProcThreads")); + } + + void RefreshProcThreads() + { + Processes.DataSource = new List<ProcessElement>(mProcesses.Values); + foreach (ProcessElement pe in mProcesses.Values) + { + if (pe.Current) + { + Threads.DataSource = new List<ThreadElement>(mProcesses[pe.ProcessId].Threads.Values); + } + } + } + + void DebugRunningChangeEvent(object sender, DebugRunningChangeEventArgs args) + { + if (!args.Running) + { + mConnection.Debugger.GetProcesses(); + } + } + + private void Processes_CellDoubleClick(object sender, DataGridViewCellEventArgs e) + { + mConnection.SetProcess(((ProcessElement)Processes.Rows[e.RowIndex].DataBoundItem).ProcessId); + } + + private void Threads_CellDoubleClick(object sender, DataGridViewCellEventArgs e) + { + mConnection.SetThread(((ThreadElement)Threads.Rows[e.RowIndex].DataBoundItem).ThreadId); + } + } +} Added: trunk/tools/reactosdbg/RosDBG/ProcThread.resx URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/ProcThread… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/ProcThread.resx (added) +++ trunk/tools/reactosdbg/RosDBG/ProcThread.resx [iso-8859-1] Tue Aug 12 05:48:38 2008 @@ -1,0 +1,120 @@ +<?xml version="1.0" encoding="utf-8"?> +<root> +  + <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> + <xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> + <xsd:element name="root" msdata:IsDataSet="true"> + <xsd:complexType> + <xsd:choice maxOccurs="unbounded"> + <xsd:element name="metadata"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" /> + </xsd:sequence> + <xsd:attribute name="name" use="required" type="xsd:string" /> + <xsd:attribute name="type" type="xsd:string" /> + <xsd:attribute name="mimetype" type="xsd:string" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="assembly"> + <xsd:complexType> + <xsd:attribute name="alias" type="xsd:string" /> + <xsd:attribute name="name" type="xsd:string" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="data"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> + <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> + <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="resheader"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" /> + </xsd:complexType> + </xsd:element> + </xsd:choice> + </xsd:complexType> + </xsd:element> + </xsd:schema> + <resheader name="resmimetype"> + <value>text/microsoft-resx</value> + </resheader> + <resheader name="version"> + <value>2.0</value> + </resheader> + <resheader name="reader"> + <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <resheader name="writer"> + <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> +</root> Modified: trunk/tools/reactosdbg/RosDBG/RegisterView.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/RegisterVi… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/RegisterView.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/RegisterView.cs [iso-8859-1] Tue Aug 12 05:48:38 2008 @@ -30,7 +30,10 @@ mConnection.DebugRegisterChangeEvent += DebugRegisterChangeEvent; mConnection.DebugRunningChangeEvent += DebugRunningChangeEvent; if (!mConnection.Running) + { mConnection.Debugger.GetRegisterUpdate(); + mConnection.Debugger.GetProcesses(); + } } void UpdateGridEnabled() Modified: trunk/tools/reactosdbg/RosDBG/RosDBG.csproj URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/RosDBG.csp… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/RosDBG.csproj [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/RosDBG.csproj [iso-8859-1] Tue Aug 12 05:48:38 2008 @@ -121,6 +121,12 @@ <Compile Include="PipeTargetSelect.Designer.cs"> <DependentUpon>PipeTargetSelect.cs</DependentUpon> </Compile> + <Compile Include="ProcThread.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Include="ProcThread.Designer.cs"> + <DependentUpon>ProcThread.cs</DependentUpon> + </Compile> <Compile Include="Program.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> <EmbeddedResource Include="BackTrace.resx"> @@ -153,6 +159,10 @@ </EmbeddedResource> <EmbeddedResource Include="PipeTargetSelect.resx"> <DependentUpon>PipeTargetSelect.cs</DependentUpon> + <SubType>Designer</SubType> + </EmbeddedResource> + <EmbeddedResource Include="ProcThread.resx"> + <DependentUpon>ProcThread.cs</DependentUpon> <SubType>Designer</SubType> </EmbeddedResource> <EmbeddedResource Include="Properties\Resources.resx">

1 0

[fireball] 35286: - Change while (true) to an ASSERT(FALSE). See issue #3616 for more details.
by fireball＠svn.reactos.org 12 Aug '08

12 Aug '08

Author: fireball Date: Tue Aug 12 03:46:31 2008 New Revision: 35286 URL: http://svn.reactos.org/svn/reactos?rev=35286&view=rev Log: - Change while (true) to an ASSERT(FALSE). See issue #3616 for more details. Modified: trunk/reactos/ntoskrnl/config/cmsysini.c Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] Tue Aug 12 03:46:31 2008 @@ -120,7 +120,7 @@ IN KPROCESSOR_MODE PreviousMode) { DPRINT1("CmpQueryKeyName() called\n"); - while (TRUE); + ASSERT(FALSE); return STATUS_SUCCESS; }

1 0

[fireball] 35285: Giannis Adamopoulos <johnyadams@hotmail.com> - Removes duplicated implementation of FrLdrLoadKernel, LoadDriver and LoadNlsFile from setupldr.c, use FrLdrLoadImage, FrLdrLoadNlsFile and FrLdrLoadDriver from reactos.c. - Also remove the call to RegInitializeRegistry as setupldr doesn't need the registry. - Make setupldr load the fastfat and ext2 drivers via txtsetup.sif, instead of hardcoding them in setupldr.c
by fireball＠svn.reactos.org 12 Aug '08

12 Aug '08

Author: fireball Date: Tue Aug 12 03:38:54 2008 New Revision: 35285 URL: http://svn.reactos.org/svn/reactos?rev=35285&view=rev Log: Giannis Adamopoulos <johnyadams(a)hotmail.com> - Removes duplicated implementation of FrLdrLoadKernel, LoadDriver and LoadNlsFile from setupldr.c, use FrLdrLoadImage, FrLdrLoadNlsFile and FrLdrLoadDriver from reactos.c. - Also remove the call to RegInitializeRegistry as setupldr doesn't need the registry. - Make setupldr load the fastfat and ext2 drivers via txtsetup.sif, instead of hardcoding them in setupldr.c Modified: trunk/reactos/boot/bootdata/txtsetup.sif trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Tue Aug 12 03:38:54 2008 @@ -32,8 +32,8 @@ pci.sys=,,,,,,,,,,,,4 scsiport.sys=,,,,,,x,,,,,,4 uniata.sys=,,,,,,,,,,,,4 -fastfat.sys=,,,,,,,,,,,,4 -ext2.sys=,,,,,,,,,,,,4 +fastfat.sys=,,,,,,x,,,,,,4 +ext2.sys=,,,,,,x,,,,,,4 [HardwareIdsDatabase] *PNP0C08 = acpi Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c [iso-8859-1] Tue Aug 12 03:38:54 2008 @@ -189,7 +189,7 @@ return LoadBase; } -static BOOLEAN +BOOLEAN FrLdrLoadNlsFile(PCSTR szFileName, PCSTR szModuleName) { Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c [iso-8859-1] Tue Aug 12 03:38:54 2008 @@ -38,133 +38,16 @@ extern ROS_KERNEL_ENTRY_POINT KernelEntryPoint; extern BOOLEAN FrLdrLoadDriver(PCHAR szFileName, INT nPos); +extern BOOLEAN FrLdrLoadNlsFile(PCSTR szFileName, PCSTR szModuleName); #define USE_UI - -BOOLEAN -NTAPI -static FrLdrLoadKernel(IN PCHAR szFileName, - IN INT nPos) -{ - PFILE FilePointer; - PCHAR szShortName; - CHAR szBuffer[256]; - PVOID LoadBase; - PIMAGE_NT_HEADERS NtHeader; - - /* Extract Kernel filename without path */ - szShortName = strrchr(szFileName, '\\'); - if (!szShortName) - { - /* No path, leave it alone */ - szShortName = szFileName; - } - else - { - /* Skip the path */ - szShortName = szShortName + 1; - } - - /* Open the Kernel */ - FilePointer = FsOpenFile(szFileName); - if (!FilePointer) - { - /* Return failure on the short name */ - strcpy(szBuffer, szShortName); - strcat(szBuffer, " not found."); - UiMessageBox(szBuffer); - return FALSE; - } - - /* Update the status bar with the current file */ - strcpy(szBuffer, "Reading "); - strcat(szBuffer, szShortName); - UiDrawStatusText(szBuffer); - - /* Do the actual loading */ - LoadBase = FrLdrReadAndMapImage(FilePointer, szShortName, 1); - - /* Get the NT header, kernel base and kernel entry */ - NtHeader = RtlImageNtHeader(LoadBase); - KernelBase = NtHeader->OptionalHeader.ImageBase; - KernelEntryPoint = (ROS_KERNEL_ENTRY_POINT)(KernelBase + NtHeader->OptionalHeader.AddressOfEntryPoint); - LoaderBlock.KernelBase = KernelBase; - - /* Update Processbar and return success */ - return TRUE; -} - -static BOOLEAN -LoadDriver(PCSTR szSourcePath, PCSTR szFileName) -{ - return FrLdrLoadDriver((PCHAR)szFileName, 0); -} - - -static BOOLEAN -LoadNlsFile(PCSTR szSourcePath, PCSTR szFileName, PCSTR szModuleName) -{ - CHAR szFullName[256]; - CHAR szBuffer[80]; - PFILE FilePointer; - PCSTR szShortName; - - if (szSourcePath[0] != '\\') - { - strcpy(szFullName, "\\"); - strcat(szFullName, szSourcePath); - } - else - { - strcpy(szFullName, szSourcePath); - } - - if (szFullName[strlen(szFullName)] != '\\') - { - strcat(szFullName, "\\"); - } - - if (szFileName[0] != '\\') - { - strcat(szFullName, szFileName); - } - else - { - strcat(szFullName, szFileName + 1); - } - - szShortName = strrchr(szFileName, '\\'); - if (szShortName == NULL) - szShortName = szFileName; - else - szShortName = szShortName + 1; - - - FilePointer = FsOpenFile(szFullName); - if (FilePointer == NULL) - { - printf("Could not find %s\n", szFileName); - return(FALSE); - } - - /* - * Update the status bar with the current file - */ - sprintf(szBuffer, "Setup is loading files (%s)", szShortName); - UiDrawStatusText(szBuffer); - - /* Load the driver */ - FrLdrLoadModule(FilePointer, szModuleName, NULL); - - return(TRUE); -} VOID RunLoader(VOID) { - ULONG i; - const char *SourcePath; - const char *LoadOptions = "", *DbgLoadOptions = ""; - const char *sourcePaths[] = { + ULONG i; + LPCSTR SourcePath; + LPCSTR LoadOptions, DbgLoadOptions; + LPCSTR sourcePaths[] = { "", /* Only for floppy boot */ #if defined(_M_IX86) "\\I386", @@ -175,11 +58,13 @@ #endif "\\reactos", NULL }; - char szKernelName[256]; + CHAR FileName[256]; HINF InfHandle; ULONG ErrorLine; INFCONTEXT InfContext; + PIMAGE_NT_HEADERS NtHeader; + PVOID LoadBase; /* Setup multiboot information structure */ LoaderBlock.CommandLine = reactos_kernel_cmdline; @@ -226,9 +111,6 @@ extern BOOLEAN FrLdrBootType; FrLdrBootType = TRUE; - /* Initialize registry */ - RegInitializeRegistry(); - /* Detect hardware */ UiDrawStatusText("Detecting hardware..."); LoaderBlock.ArchExtra = (ULONG)MachHwDetect(); @@ -244,6 +126,7 @@ return; } + UiDrawStatusText("Loading txtsetup.sif..."); /* Open 'txtsetup.sif' */ for (i = MachDiskBootingFromFloppy() ? 0 : 1; ; i++) { @@ -253,9 +136,8 @@ printf("Failed to open 'txtsetup.sif'\n"); return; } - strcpy(szKernelName, SourcePath); - strcat(szKernelName, "\\txtsetup.sif"); - if (InfOpenFile (&InfHandle, szKernelName, &ErrorLine)) + sprintf(FileName,"%s\\txtsetup.sif", SourcePath); + if (InfOpenFile (&InfHandle, FileName, &ErrorLine)) break; } if (!*SourcePath) @@ -294,20 +176,22 @@ strcat(strcat(strcat(strcat(reactos_kernel_cmdline, SourcePath), " "), LoadOptions), DbgLoadOptions); - strcpy(SystemRoot, SourcePath); - strcat(SystemRoot, "\\"); - /* Setup the boot path and kernel path */ strcpy(szBootPath, SourcePath); - strcpy(szKernelName, szBootPath); - strcat(szKernelName, "\\ntoskrnl.exe"); - - /* Setup the HAL path */ - strcpy(szHalName, szBootPath); - strcat(szHalName, "\\hal.dll"); + + sprintf(SystemRoot,"%s\\", SourcePath); + sprintf(FileName,"%s\\ntoskrnl.exe", SourcePath); + sprintf(szHalName,"%s\\hal.dll", SourcePath); /* Load the kernel */ - if (!FrLdrLoadKernel(szKernelName, 5)) return; + LoadBase = FrLdrLoadImage(FileName, 5, 1); + if (!LoadBase) return; + + /* Get the NT header, kernel base and kernel entry */ + NtHeader = RtlImageNtHeader(LoadBase); + KernelBase = SWAPD(NtHeader->OptionalHeader.ImageBase); + KernelEntryPoint = (ROS_KERNEL_ENTRY_POINT)(KernelBase + SWAPD(NtHeader->OptionalHeader.AddressOfEntryPoint)); + LoaderBlock.KernelBase = KernelBase; /* Insert boot disk 2 */ if (MachDiskBootingFromFloppy()) @@ -343,8 +227,9 @@ return; } + sprintf(FileName,"%s\\%s", SourcePath,LoadOptions); /* Load ANSI codepage file */ - if (!LoadNlsFile(SourcePath, LoadOptions, "ansi.nls")) + if (!FrLdrLoadNlsFile(FileName, "ansi.nls")) { UiMessageBox("Failed to load the ANSI codepage file."); return; @@ -368,8 +253,9 @@ return; } + sprintf(FileName,"%s\\%s", SourcePath,LoadOptions); /* Load OEM codepage file */ - if (!LoadNlsFile(SourcePath, LoadOptions, "oem.nls")) + if (!FrLdrLoadNlsFile(FileName, "oem.nls")) { UiMessageBox("Failed to load the OEM codepage file."); return; @@ -393,20 +279,13 @@ return; } + sprintf(FileName,"%s\\%s", SourcePath,LoadOptions); /* Load Unicode casemap file */ - if (!LoadNlsFile(SourcePath, LoadOptions, "casemap.nls")) + if (!FrLdrLoadNlsFile(FileName, "casemap.nls")) { UiMessageBox("Failed to load the Unicode casemap file."); return; } - - /* Load fastfat.sys (could be loaded by the setup prog!) */ - if (!LoadDriver(SourcePath, "fastfat.sys")) - return; - - /* Load ext2.sys (could be loaded by the setup prog!) */ - if (!LoadDriver(SourcePath, "ext2.sys")) - return; /* Load additional files specified in txtsetup.inf */ if (InfFindFirstLine(InfHandle, @@ -422,7 +301,7 @@ { if (strcmp(Media, "x") == 0) { - if (!LoadDriver(SourcePath, DriverName)) + if (!FrLdrLoadDriver((PCHAR)DriverName,0)) return; } }

1 0

[arty] 35284: Harden 'proc list'
by arty＠svn.reactos.org 12 Aug '08

12 Aug '08

Author: arty Date: Tue Aug 12 01:59:37 2008 New Revision: 35284 URL: http://svn.reactos.org/svn/reactos?rev=35284&view=rev Log: Harden 'proc list' Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_cli.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] Tue Aug 12 01:59:37 2008 @@ -1266,7 +1266,7 @@ if (Argc >= 2 && _stricmp(Argv[1], "list") == 0) { Entry = PsActiveProcessHead.Flink; - if (Entry == &PsActiveProcessHead) + if (!Entry || Entry == &PsActiveProcessHead) { KdbpPrint("No processes in the system!\n"); return TRUE;

1 0

← Newer
1
...
53
54
55
56
57
58
59
...
86
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2008