Author: gschneider Date: Wed Aug 26 17:08:02 2009 New Revision: 42938
URL: http://svn.reactos.org/svn/reactos?rev=42938&view=rev Log: - Rename "connected" to "state"; introduce three possible states: not connected, waiting (for a connection or while in kdbg) and debug; bug #4814 - Don't send commands to kdbg without being connected, notice if a user leaves kdbg manually by entering "cont" - Add subtypes to project file
Modified: trunk/tools/reactosdbg/DebugProtocol/KDBG.cs trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.cs trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs trunk/tools/reactosdbg/RosDBG/MainWindow.cs trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs trunk/tools/reactosdbg/RosDBG/RosDBG.csproj
Modified: trunk/tools/reactosdbg/DebugProtocol/KDBG.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/DebugProtocol/KDBG... ============================================================================== --- trunk/tools/reactosdbg/DebugProtocol/KDBG.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/DebugProtocol/KDBG.cs [iso-8859-1] Wed Aug 26 17:08:02 2009 @@ -422,7 +422,14 @@ GetRegisterUpdate(); }
- public void Write(string wr) { mConnection.Write(wr); } + public void Write(string wr) + { + /* Forward user input from RawTraffic if connected to kdbg */ + if (!mRunning) + { + mConnection.Write(wr); + } + }
public void Close() {
Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Dockable%20... ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.cs [iso-8859-1] Wed Aug 26 17:08:02 2009 @@ -139,8 +139,13 @@ { if (RawTrafficTextBox.Text.Length > 0 && mConnection.Debugger != null) { + String cmd = RawTrafficTextBox.Text; RawTrafficText.AppendText(kdbPrompt); - mConnection.Debugger.Write(RawTrafficTextBox.Text); + if (cmd == "cont\r") + { + mConnection.Running = true; + } + mConnection.Debugger.Write(cmd); } }
Modified: trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/MainWindow.... ============================================================================== --- trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs [iso-8859-1] Wed Aug 26 17:08:02 2009 @@ -628,7 +628,7 @@ this.toolStripStatusLabel3.Name = "toolStripStatusLabel3"; this.toolStripStatusLabel3.Padding = new System.Windows.Forms.Padding(10, 0, 0, 0); this.toolStripStatusLabel3.Size = new System.Drawing.Size(78, 19); - this.toolStripStatusLabel3.Text = "Connected:"; + this.toolStripStatusLabel3.Text = "State:"; this.toolStripStatusLabel3.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // toolStripStatusConnected
Modified: trunk/tools/reactosdbg/RosDBG/MainWindow.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/MainWindow.... ============================================================================== --- trunk/tools/reactosdbg/RosDBG/MainWindow.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/MainWindow.cs [iso-8859-1] Wed Aug 26 17:08:02 2009 @@ -85,8 +85,24 @@ }
toolStripStatusConnectionMode.Text = mode; - toolStripStatusConnected.ForeColor = mRunning ? Color.Green : Color.Crimson; - toolStripStatusConnected.Text = mRunning.ToString(); + if (mConnectionMode == DebugConnection.Mode.ClosedMode) + { + toolStripStatusConnected.ForeColor = Color.Crimson; + toolStripStatusConnected.Text = "Not connected"; + } + else + { + if (mRunning) + { + toolStripStatusConnected.ForeColor = Color.Green; + toolStripStatusConnected.Text = "Debug"; + } + else + { + toolStripStatusConnected.ForeColor = Color.Yellow; + toolStripStatusConnected.Text = "Waiting"; + } + }
if (mCurrentFile.CompareTo("unknown") != 0) {
Modified: trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Properties/... ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs [iso-8859-1] Wed Aug 26 17:08:02 2009 @@ -39,5 +39,5 @@ // will be increased as well. MSI installers must not be generated with the same Build Number // otherwise they won't upgrade the old installation!
-[assembly: AssemblyVersion("1.0.2.74")] -[assembly: AssemblyFileVersion("1.0.2.74")] +[assembly: AssemblyVersion("1.0.2.76")] +[assembly: AssemblyFileVersion("1.0.2.76")]
Modified: trunk/tools/reactosdbg/RosDBG/RosDBG.csproj URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/RosDBG.cspr... ============================================================================== --- trunk/tools/reactosdbg/RosDBG/RosDBG.csproj [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/RosDBG.csproj [iso-8859-1] Wed Aug 26 17:08:02 2009 @@ -99,6 +99,7 @@ </Compile> <Compile Include="Diagnostics.cs" /> <Compile Include="Dockable Objects\BackTrace.cs"> + <SubType>Form</SubType> </Compile> <Compile Include="Dockable Objects\BackTrace.Designer.cs"> <DependentUpon>BackTrace.cs</DependentUpon> @@ -116,6 +117,7 @@ <Compile Include="FileDirChooser.cs"> </Compile> <Compile Include="Dockable Objects\ToolWindow.cs"> + <SubType>Form</SubType> </Compile> <Compile Include="Dockable Objects\ToolWindow.Designer.cs"> <DependentUpon>ToolWindow.cs</DependentUpon> @@ -125,6 +127,7 @@ <Compile Include="IUseDebugConnection.cs" /> <Compile Include="IUseSymbols.cs" /> <Compile Include="Dockable Objects\Locals.cs"> + <SubType>Form</SubType> </Compile> <Compile Include="Dockable Objects\Locals.Designer.cs"> <DependentUpon>Locals.cs</DependentUpon> @@ -136,6 +139,7 @@ <DependentUpon>MainWindow.cs</DependentUpon> </Compile> <Compile Include="Dockable Objects\MemoryWindow.cs"> + <SubType>Form</SubType> </Compile> <Compile Include="Dockable Objects\MemoryWindow.Designer.cs"> <DependentUpon>MemoryWindow.cs</DependentUpon> @@ -143,11 +147,13 @@ <Compile Include="Module.cs" /> <Compile Include="ModuleIndex.cs" /> <Compile Include="Dockable Objects\Modules.cs"> + <SubType>Form</SubType> </Compile> <Compile Include="Dockable Objects\Modules.Designer.cs"> <DependentUpon>Modules.cs</DependentUpon> </Compile> <Compile Include="Dockable Objects\ProcThread.cs"> + <SubType>Form</SubType> </Compile> <Compile Include="Dockable Objects\ProcThread.Designer.cs"> <DependentUpon>ProcThread.cs</DependentUpon> @@ -156,9 +162,11 @@ <Compile Include="Properties\AssemblyInfo.cs" /> <EmbeddedResource Include="AboutDlg.resx"> <DependentUpon>AboutDlg.cs</DependentUpon> + <SubType>Designer</SubType> </EmbeddedResource> <EmbeddedResource Include="Connect.resx"> <DependentUpon>Connect.cs</DependentUpon> + <SubType>Designer</SubType> </EmbeddedResource> <EmbeddedResource Include="Dockable Objects\BackTrace.resx"> <DependentUpon>BackTrace.cs</DependentUpon> @@ -170,9 +178,11 @@ </EmbeddedResource> <EmbeddedResource Include="ExtTools.resx"> <DependentUpon>ExtTools.cs</DependentUpon> + <SubType>Designer</SubType> </EmbeddedResource> <EmbeddedResource Include="MainWindow.resx"> <DependentUpon>MainWindow.cs</DependentUpon> + <SubType>Designer</SubType> </EmbeddedResource> <EmbeddedResource Include="Dockable Objects\MemoryWindow.resx"> <DependentUpon>MemoryWindow.cs</DependentUpon> @@ -226,16 +236,19 @@ <DesignTimeSharedInput>True</DesignTimeSharedInput> </Compile> <Compile Include="Dockable Objects\RawTraffic.cs"> + <SubType>Form</SubType> </Compile> <Compile Include="Dockable Objects\RawTraffic.Designer.cs"> <DependentUpon>RawTraffic.cs</DependentUpon> </Compile> <Compile Include="Dockable Objects\ReactOSWeb.cs"> + <SubType>Form</SubType> </Compile> <Compile Include="Dockable Objects\ReactOSWeb.Designer.cs"> <DependentUpon>ReactOSWeb.cs</DependentUpon> </Compile> <Compile Include="Dockable Objects\RegisterView.cs"> + <SubType>Form</SubType> </Compile> <Compile Include="Dockable Objects\RegisterView.Designer.cs"> <DependentUpon>RegisterView.cs</DependentUpon> @@ -247,6 +260,7 @@ <DependentUpon>Settings.cs</DependentUpon> </Compile> <Compile Include="Dockable Objects\SourceView.cs"> + <SubType>Form</SubType> </Compile> <Compile Include="Dockable Objects\SourceView.Designer.cs"> <DependentUpon>SourceView.cs</DependentUpon>