Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gedmurphy] 41270: split and set the status info instead of dumping everything into a string
by gedmurphy＠svn.reactos.org 03 Jun '09

03 Jun '09

Author: gedmurphy Date: Wed Jun 3 16:28:36 2009 New Revision: 41270 URL: http://svn.reactos.org/svn/reactos?rev=41270&view=rev Log: split and set the status info instead of dumping everything into a string Modified: trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs trunk/tools/reactosdbg/RosDBG/MainWindow.cs trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs 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 Jun 3 16:28:36 2009 @@ -30,21 +30,21 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainWindow)); - WeifenLuo.WinFormsUI.Docking.DockPanelSkin dockPanelSkin2 = new WeifenLuo.WinFormsUI.Docking.DockPanelSkin(); - WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin autoHideStripSkin2 = new WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin(); - WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient4 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient8 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin dockPaneStripSkin2 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin(); - WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient dockPaneStripGradient2 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient9 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient5 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient10 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient dockPaneStripToolWindowGradient2 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient11 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient12 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient6 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient13 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient14 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.DockPanelSkin dockPanelSkin1 = new WeifenLuo.WinFormsUI.Docking.DockPanelSkin(); + WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin autoHideStripSkin1 = new WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin(); + WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient1 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient1 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin dockPaneStripSkin1 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin(); + WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient dockPaneStripGradient1 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient2 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient2 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient3 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient dockPaneStripToolWindowGradient1 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient4 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient5 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient3 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient6 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient7 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); this.menuStrip = new System.Windows.Forms.MenuStrip(); this.fileMenu = new System.Windows.Forms.ToolStripMenuItem(); this.openToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -95,9 +95,16 @@ this.continueToolStripButton = new System.Windows.Forms.ToolStripButton(); this.breakToolStripButton = new System.Windows.Forms.ToolStripButton(); this.statusStrip = new System.Windows.Forms.StatusStrip(); - this.toolStripStatusLabel = new System.Windows.Forms.ToolStripStatusLabel(); this.toolTip = new System.Windows.Forms.ToolTip(this.components); this.dockPanel = new WeifenLuo.WinFormsUI.Docking.DockPanel(); + this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel(); + this.toolStripStatusConnectionMode = new System.Windows.Forms.ToolStripStatusLabel(); + this.toolStripStatusLabel3 = new System.Windows.Forms.ToolStripStatusLabel(); + this.toolStripStatusConnected = new System.Windows.Forms.ToolStripStatusLabel(); + this.toolStripStatusSourceLocation = new System.Windows.Forms.ToolStripStatusLabel(); + this.toolStripStatusSourceLocationFile = new System.Windows.Forms.ToolStripStatusLabel(); + this.toolStripStatusSourceLocationLine = new System.Windows.Forms.ToolStripStatusLabel(); + this.toolStripStatusSourceLocationColon = new System.Windows.Forms.ToolStripStatusLabel(); this.menuStrip.SuspendLayout(); this.toolStrip.SuspendLayout(); this.statusStrip.SuspendLayout(); @@ -381,19 +388,19 @@ // externalToolsToolStripMenuItem // this.externalToolsToolStripMenuItem.Name = "externalToolsToolStripMenuItem"; - this.externalToolsToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.externalToolsToolStripMenuItem.Size = new System.Drawing.Size(147, 22); this.externalToolsToolStripMenuItem.Text = "Exte&rnal Tools"; this.externalToolsToolStripMenuItem.Click += new System.EventHandler(this.externalToolsToolStripMenuItem_Click); // // toolStripMenuItem5 // this.toolStripMenuItem5.Name = "toolStripMenuItem5"; - this.toolStripMenuItem5.Size = new System.Drawing.Size(149, 6); + this.toolStripMenuItem5.Size = new System.Drawing.Size(144, 6); // // optionsToolStripMenuItem // this.optionsToolStripMenuItem.Name = "optionsToolStripMenuItem"; - this.optionsToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.optionsToolStripMenuItem.Size = new System.Drawing.Size(147, 22); this.optionsToolStripMenuItem.Text = "&Settings"; this.optionsToolStripMenuItem.Click += new System.EventHandler(this.optionsToolStripMenuItem_Click); // @@ -525,18 +532,19 @@ // statusStrip // this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.toolStripStatusLabel}); - this.statusStrip.Location = new System.Drawing.Point(0, 542); + this.toolStripStatusLabel1, + this.toolStripStatusConnectionMode, + this.toolStripStatusLabel3, + this.toolStripStatusConnected, + this.toolStripStatusSourceLocation, + this.toolStripStatusSourceLocationFile, + this.toolStripStatusSourceLocationColon, + this.toolStripStatusSourceLocationLine}); + this.statusStrip.Location = new System.Drawing.Point(0, 540); this.statusStrip.Name = "statusStrip"; - this.statusStrip.Size = new System.Drawing.Size(784, 22); + this.statusStrip.Size = new System.Drawing.Size(784, 24); this.statusStrip.TabIndex = 2; this.statusStrip.Text = "StatusStrip"; - // - // toolStripStatusLabel - // - this.toolStripStatusLabel.Name = "toolStripStatusLabel"; - this.toolStripStatusLabel.Size = new System.Drawing.Size(39, 17); - this.toolStripStatusLabel.Text = "Status"; // // dockPanel // @@ -549,52 +557,115 @@ this.dockPanel.Location = new System.Drawing.Point(0, 49); this.dockPanel.Name = "dockPanel"; this.dockPanel.Size = new System.Drawing.Size(784, 490); - dockPanelGradient4.EndColor = System.Drawing.SystemColors.ControlLight; - dockPanelGradient4.StartColor = System.Drawing.SystemColors.ControlLight; - autoHideStripSkin2.DockStripGradient = dockPanelGradient4; - tabGradient8.EndColor = System.Drawing.SystemColors.Control; - tabGradient8.StartColor = System.Drawing.SystemColors.Control; - tabGradient8.TextColor = System.Drawing.SystemColors.ControlDarkDark; - autoHideStripSkin2.TabGradient = tabGradient8; - dockPanelSkin2.AutoHideStripSkin = autoHideStripSkin2; - tabGradient9.EndColor = System.Drawing.SystemColors.ControlLightLight; - tabGradient9.StartColor = System.Drawing.SystemColors.ControlLightLight; - tabGradient9.TextColor = System.Drawing.SystemColors.ControlText; - dockPaneStripGradient2.ActiveTabGradient = tabGradient9; - dockPanelGradient5.EndColor = System.Drawing.SystemColors.Control; - dockPanelGradient5.StartColor = System.Drawing.SystemColors.Control; - dockPaneStripGradient2.DockStripGradient = dockPanelGradient5; - tabGradient10.EndColor = System.Drawing.SystemColors.ControlLight; - tabGradient10.StartColor = System.Drawing.SystemColors.ControlLight; - tabGradient10.TextColor = System.Drawing.SystemColors.ControlText; - dockPaneStripGradient2.InactiveTabGradient = tabGradient10; - dockPaneStripSkin2.DocumentGradient = dockPaneStripGradient2; - tabGradient11.EndColor = System.Drawing.SystemColors.ActiveCaption; - tabGradient11.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical; - tabGradient11.StartColor = System.Drawing.SystemColors.GradientActiveCaption; - tabGradient11.TextColor = System.Drawing.SystemColors.ActiveCaptionText; - dockPaneStripToolWindowGradient2.ActiveCaptionGradient = tabGradient11; - tabGradient12.EndColor = System.Drawing.SystemColors.Control; - tabGradient12.StartColor = System.Drawing.SystemColors.Control; - tabGradient12.TextColor = System.Drawing.SystemColors.ControlText; - dockPaneStripToolWindowGradient2.ActiveTabGradient = tabGradient12; - dockPanelGradient6.EndColor = System.Drawing.SystemColors.ControlLight; - dockPanelGradient6.StartColor = System.Drawing.SystemColors.ControlLight; - dockPaneStripToolWindowGradient2.DockStripGradient = dockPanelGradient6; - tabGradient13.EndColor = System.Drawing.SystemColors.GradientInactiveCaption; - tabGradient13.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical; - tabGradient13.StartColor = System.Drawing.SystemColors.GradientInactiveCaption; - tabGradient13.TextColor = System.Drawing.SystemColors.ControlText; - dockPaneStripToolWindowGradient2.InactiveCaptionGradient = tabGradient13; - tabGradient14.EndColor = System.Drawing.Color.Transparent; - tabGradient14.StartColor = System.Drawing.Color.Transparent; - tabGradient14.TextColor = System.Drawing.SystemColors.ControlDarkDark; - dockPaneStripToolWindowGradient2.InactiveTabGradient = tabGradient14; - dockPaneStripSkin2.ToolWindowGradient = dockPaneStripToolWindowGradient2; - dockPanelSkin2.DockPaneStripSkin = dockPaneStripSkin2; - this.dockPanel.Skin = dockPanelSkin2; + dockPanelGradient1.EndColor = System.Drawing.SystemColors.ControlLight; + dockPanelGradient1.StartColor = System.Drawing.SystemColors.ControlLight; + autoHideStripSkin1.DockStripGradient = dockPanelGradient1; + tabGradient1.EndColor = System.Drawing.SystemColors.Control; + tabGradient1.StartColor = System.Drawing.SystemColors.Control; + tabGradient1.TextColor = System.Drawing.SystemColors.ControlDarkDark; + autoHideStripSkin1.TabGradient = tabGradient1; + dockPanelSkin1.AutoHideStripSkin = autoHideStripSkin1; + tabGradient2.EndColor = System.Drawing.SystemColors.ControlLightLight; + tabGradient2.StartColor = System.Drawing.SystemColors.ControlLightLight; + tabGradient2.TextColor = System.Drawing.SystemColors.ControlText; + dockPaneStripGradient1.ActiveTabGradient = tabGradient2; + dockPanelGradient2.EndColor = System.Drawing.SystemColors.Control; + dockPanelGradient2.StartColor = System.Drawing.SystemColors.Control; + dockPaneStripGradient1.DockStripGradient = dockPanelGradient2; + tabGradient3.EndColor = System.Drawing.SystemColors.ControlLight; + tabGradient3.StartColor = System.Drawing.SystemColors.ControlLight; + tabGradient3.TextColor = System.Drawing.SystemColors.ControlText; + dockPaneStripGradient1.InactiveTabGradient = tabGradient3; + dockPaneStripSkin1.DocumentGradient = dockPaneStripGradient1; + tabGradient4.EndColor = System.Drawing.SystemColors.ActiveCaption; + tabGradient4.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical; + tabGradient4.StartColor = System.Drawing.SystemColors.GradientActiveCaption; + tabGradient4.TextColor = System.Drawing.SystemColors.ActiveCaptionText; + dockPaneStripToolWindowGradient1.ActiveCaptionGradient = tabGradient4; + tabGradient5.EndColor = System.Drawing.SystemColors.Control; + tabGradient5.StartColor = System.Drawing.SystemColors.Control; + tabGradient5.TextColor = System.Drawing.SystemColors.ControlText; + dockPaneStripToolWindowGradient1.ActiveTabGradient = tabGradient5; + dockPanelGradient3.EndColor = System.Drawing.SystemColors.ControlLight; + dockPanelGradient3.StartColor = System.Drawing.SystemColors.ControlLight; + dockPaneStripToolWindowGradient1.DockStripGradient = dockPanelGradient3; + tabGradient6.EndColor = System.Drawing.SystemColors.GradientInactiveCaption; + tabGradient6.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical; + tabGradient6.StartColor = System.Drawing.SystemColors.GradientInactiveCaption; + tabGradient6.TextColor = System.Drawing.SystemColors.ControlText; + dockPaneStripToolWindowGradient1.InactiveCaptionGradient = tabGradient6; + tabGradient7.EndColor = System.Drawing.Color.Transparent; + tabGradient7.StartColor = System.Drawing.Color.Transparent; + tabGradient7.TextColor = System.Drawing.SystemColors.ControlDarkDark; + dockPaneStripToolWindowGradient1.InactiveTabGradient = tabGradient7; + dockPaneStripSkin1.ToolWindowGradient = dockPaneStripToolWindowGradient1; + dockPanelSkin1.DockPaneStripSkin = dockPaneStripSkin1; + this.dockPanel.Skin = dockPanelSkin1; this.dockPanel.TabIndex = 4; this.dockPanel.ActiveDocumentChanged += new System.EventHandler(this.dockPanel_ActiveDocumentChanged); + // + // toolStripStatusLabel1 + // + this.toolStripStatusLabel1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; + this.toolStripStatusLabel1.Name = "toolStripStatusLabel1"; + this.toolStripStatusLabel1.Size = new System.Drawing.Size(106, 19); + this.toolStripStatusLabel1.Text = "Connection Mode:"; + this.toolStripStatusLabel1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // toolStripStatusConnectionMode + // + this.toolStripStatusConnectionMode.BorderSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.Right; + this.toolStripStatusConnectionMode.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; + this.toolStripStatusConnectionMode.Name = "toolStripStatusConnectionMode"; + this.toolStripStatusConnectionMode.Padding = new System.Windows.Forms.Padding(0, 0, 10, 0); + this.toolStripStatusConnectionMode.Size = new System.Drawing.Size(72, 19); + this.toolStripStatusConnectionMode.Text = "Unknown"; + this.toolStripStatusConnectionMode.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // toolStripStatusLabel3 + // + this.toolStripStatusLabel3.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; + 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.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // toolStripStatusConnected + // + this.toolStripStatusConnected.BorderSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.Right; + this.toolStripStatusConnected.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; + this.toolStripStatusConnected.ForeColor = System.Drawing.Color.Crimson; + this.toolStripStatusConnected.Name = "toolStripStatusConnected"; + this.toolStripStatusConnected.Padding = new System.Windows.Forms.Padding(0, 0, 10, 0); + this.toolStripStatusConnected.Size = new System.Drawing.Size(45, 19); + this.toolStripStatusConnected.Text = "false"; + this.toolStripStatusConnected.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // toolStripStatusSourceLocation + // + this.toolStripStatusSourceLocation.Name = "toolStripStatusSourceLocation"; + this.toolStripStatusSourceLocation.Padding = new System.Windows.Forms.Padding(10, 0, 0, 0); + this.toolStripStatusSourceLocation.Size = new System.Drawing.Size(105, 19); + this.toolStripStatusSourceLocation.Text = "Source Location:"; + // + // toolStripStatusSourceLocationFile + // + this.toolStripStatusSourceLocationFile.Name = "toolStripStatusSourceLocationFile"; + this.toolStripStatusSourceLocationFile.Size = new System.Drawing.Size(25, 19); + this.toolStripStatusSourceLocationFile.Text = "File"; + // + // toolStripStatusSourceLocationLine + // + this.toolStripStatusSourceLocationLine.Name = "toolStripStatusSourceLocationLine"; + this.toolStripStatusSourceLocationLine.Size = new System.Drawing.Size(29, 19); + this.toolStripStatusSourceLocationLine.Text = "Line"; + // + // toolStripStatusSourceLocationColon + // + this.toolStripStatusSourceLocationColon.Name = "toolStripStatusSourceLocationColon"; + this.toolStripStatusSourceLocationColon.Size = new System.Drawing.Size(10, 19); + this.toolStripStatusSourceLocationColon.Text = ":"; // // MainWindow // @@ -635,7 +706,6 @@ private System.Windows.Forms.ToolStripSeparator toolStripSeparator5; private System.Windows.Forms.ToolStripMenuItem printSetupToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator8; - private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel; private System.Windows.Forms.ToolStripMenuItem aboutToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem fileMenu; private System.Windows.Forms.ToolStripMenuItem openToolStripMenuItem; @@ -678,6 +748,14 @@ private System.Windows.Forms.ToolStripMenuItem externalToolsToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripMenuItem5; private System.Windows.Forms.ToolStripMenuItem optionsToolStripMenuItem; + private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel1; + private System.Windows.Forms.ToolStripStatusLabel toolStripStatusConnectionMode; + private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel3; + private System.Windows.Forms.ToolStripStatusLabel toolStripStatusConnected; + private System.Windows.Forms.ToolStripStatusLabel toolStripStatusSourceLocation; + private System.Windows.Forms.ToolStripStatusLabel toolStripStatusSourceLocationFile; + private System.Windows.Forms.ToolStripStatusLabel toolStripStatusSourceLocationLine; + private System.Windows.Forms.ToolStripStatusLabel toolStripStatusSourceLocationColon; } } 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 Jun 3 16:28:36 2009 @@ -73,7 +73,35 @@ void ComposeTitleString() { FocusAddress(mCurrentEip); - toolStripStatusLabel.Text = "ConnectionMode: " + mConnectionMode + " - Running: " + mRunning + (mCurrentFile.CompareTo("unknown") != 0 ? " - Source Location: " + mCurrentFile + ":" + mCurrentLine : ""); + + string mode; + switch (mConnectionMode) + { + case DebugConnection.Mode.ClosedMode: mode = "Closed"; break; + case DebugConnection.Mode.PipeMode: mode = "Pipe"; break; + case DebugConnection.Mode.SerialMode: mode = "Serial"; break; + case DebugConnection.Mode.SocketMode: mode = "Socket"; break; + default: mode = "Unknown"; break; + } + + toolStripStatusConnectionMode.Text = mode; + toolStripStatusConnected.ForeColor = mRunning ? Color.Green : Color.Crimson; + toolStripStatusConnected.Text = mRunning.ToString(); + + if (mCurrentFile.CompareTo("unknown") != 0) + { + toolStripStatusSourceLocation.Text = "Source Location:"; + toolStripStatusSourceLocationFile.Text = mCurrentFile; + toolStripStatusSourceLocationLine.Text = mCurrentLine.ToString(); + toolStripStatusSourceLocationColon.Visible = true; + } + else + { + toolStripStatusSourceLocation.Text = string.Empty; + toolStripStatusSourceLocationFile.Text = string.Empty; + toolStripStatusSourceLocationLine.Text = string.Empty; + toolStripStatusSourceLocationColon.Visible = false; + } } void DebugModuleChangedEvent(object sender, DebugModuleChangedEventArgs args) 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 Jun 3 16:28:36 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.54")] -[assembly: AssemblyFileVersion("1.0.2.54")] +[assembly: AssemblyVersion("1.0.2.55")] +[assembly: AssemblyFileVersion("1.0.2.55")]

1 0

[mjmartin] 41269: - IopCreateDriver: Change MajorFunction routines back to internal function IopInvalidDeviceRequest for ones that were set to NULL in the Drivers DriverEntry. Windows does it and so shall we.
by mjmartin＠svn.reactos.org 03 Jun '09

03 Jun '09

Author: mjmartin Date: Wed Jun 3 13:48:33 2009 New Revision: 41269 URL: http://svn.reactos.org/svn/reactos?rev=41269&view=rev Log: - IopCreateDriver: Change MajorFunction routines back to internal function IopInvalidDeviceRequest for ones that were set to NULL in the Drivers DriverEntry. Windows does it and so shall we. Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Wed Jun 3 13:48:33 2009 @@ -1302,7 +1302,7 @@ RtlZeroMemory(DriverObject, ObjectSize); DriverObject->Type = IO_TYPE_DRIVER; DriverObject->Size = sizeof(DRIVER_OBJECT); - DriverObject->Flags = DRVO_BUILTIN_DRIVER; + DriverObject->Flags = DRVO_LEGACY_DRIVER;//DRVO_BUILTIN_DRIVER; DriverObject->DriverExtension = (PDRIVER_EXTENSION)(DriverObject + 1); DriverObject->DriverExtension->DriverObject = DriverObject; DriverObject->DriverInit = InitializationFunction; @@ -1398,6 +1398,14 @@ { /* Returns to caller the object */ *pDriverObject = DriverObject; + } + + /* Loop all Major Functions */ + for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++) + { + /* Set each function that was set to NULL to internal routine */ + if (!DriverObject->MajorFunction[i]) + DriverObject->MajorFunction[i] = IopInvalidDeviceRequest; } /* Return the Status */

2 1

[gedmurphy] 41268: - Detect when clients disconnect from the pipe server and raise an event - Reinitialize the pipe server and wait for new connections on disconnect - You can disconnect and reconnect reactos without restarting rosdbg now - Fix the read and write threads to we don't have to call the evil Thread.Abort (for kjk) - Don't enumerate the externals tools if the list is empty, fixes a NullReferenceException
by gedmurphy＠svn.reactos.org 03 Jun '09

03 Jun '09

Author: gedmurphy Date: Wed Jun 3 13:41:47 2009 New Revision: 41268 URL: http://svn.reactos.org/svn/reactos?rev=41268&view=rev Log: - Detect when clients disconnect from the pipe server and raise an event - Reinitialize the pipe server and wait for new connections on disconnect - You can disconnect and reconnect reactos without restarting rosdbg now - Fix the read and write threads to we don't have to call the evil Thread.Abort (for kjk) - Don't enumerate the externals tools if the list is empty, fixes a NullReferenceException Modified: trunk/tools/reactosdbg/DebugProtocol/DebugConnection.cs trunk/tools/reactosdbg/Pipe/namedpipe.cs trunk/tools/reactosdbg/Pipe/pipe.cs trunk/tools/reactosdbg/RosDBG/MainWindow.cs trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs 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] Wed Jun 3 13:41:47 2009 @@ -173,6 +173,8 @@ #region Named Pipe Members NamedPipe mNamedPipe; + string mPipeName; + ConnectionMode mMode; Thread ReadThread; Thread WriteThread; #endregion @@ -235,13 +237,24 @@ WriteThread.Start(); } + void NamedPipe_ClientDisconectedEvent(object sender, EventArgs e) + { + Running = false; + mNamedPipe.Close(); + mNamedPipe.CreatePipe(mPipeName, mMode); + } + public void StartPipe(string pipeName, ConnectionMode mode) { + mPipeName = pipeName; + mMode = mode; + Close(); ConnectionMode = Mode.PipeMode; mNamedPipe = new NamedPipe(); mNamedPipe.ClientConnectedEvent += new EventHandler(NamedPipe_ClientConnectedEvent); + mNamedPipe.ClientDisconnectedEvent += new EventHandler(NamedPipe_ClientDisconectedEvent); mNamedPipe.PipeReceiveEvent +=new PipeReceiveEventHandler(PipeReceiveEvent); mNamedPipe.PipeErrorEvent +=new PipeErrorEventHandler(MediumErrorEvent); @@ -352,10 +365,7 @@ mNamedPipe = null; } Running = false; - if (ReadThread != null) - ReadThread.Abort(); - if (WriteThread != null) - WriteThread.Abort(); + break; } Modified: trunk/tools/reactosdbg/Pipe/namedpipe.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/Pipe/namedpipe.cs… ============================================================================== --- trunk/tools/reactosdbg/Pipe/namedpipe.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/Pipe/namedpipe.cs [iso-8859-1] Wed Jun 3 13:41:47 2009 @@ -27,6 +27,7 @@ private Thread waitThread; public event EventHandler ClientConnectedEvent; + public event EventHandler ClientDisconnectedEvent; public event PipeReceiveEventHandler PipeReceiveEvent; public event PipeErrorEventHandler PipeErrorEvent; @@ -129,6 +130,11 @@ if (ioStream != null) ioStream.Close(); + bClientConn = false; + + /* Wake up the write thread so it can die */ + newWriteData.Set(); + if (waitThread != null) waitThread.Abort(); } @@ -144,7 +150,7 @@ { try { - while (true) + while (bClientConn) { if (cmdList.Count > 0) { @@ -186,7 +192,7 @@ { try { - while (true) + while (bClientConn) { read = ioStream.Read(buf, 0, PIPE_SIZE); if (read > 0) @@ -196,7 +202,16 @@ } else { - /* connecion closed */ + /* + * Connecion closed! + * We'll hijack this thread and use it to set up our pipe server again. + * This thread will terminate once the connection is set up, it does not block. + */ + if (ClientDisconnectedEvent != null) + { + ClientDisconnectedEvent(this, EventArgs.Empty); + } + break; } } Modified: trunk/tools/reactosdbg/Pipe/pipe.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/Pipe/pipe.cs?rev=… ============================================================================== --- trunk/tools/reactosdbg/Pipe/pipe.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/Pipe/pipe.cs [iso-8859-1] Wed Jun 3 13:41:47 2009 @@ -35,5 +35,6 @@ public interface NPipe { event EventHandler ClientConnectedEvent; + event EventHandler ClientDisconnectedEvent; } } 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 Jun 3 13:41:47 2009 @@ -408,14 +408,17 @@ if (i >= toolsMenu.DropDownItems.Count - 1) break; } - foreach (object o in Settings.ExternalTools) - { - ToolStripMenuItem item = new ToolStripMenuItem(o.ToString(), null, - new System.EventHandler(this.LaunchExternalToolToolStripMenuItem_Click), - ((ExternalTool)o).Path); - item.Tag = "tool"; - toolsMenu.DropDownItems.Insert(bFirst ? 0 : 1, item); - bFirst = false; + if (Settings.ExternalTools != null) + { + foreach (object o in Settings.ExternalTools) + { + ToolStripMenuItem item = new ToolStripMenuItem(o.ToString(), null, + new System.EventHandler(this.LaunchExternalToolToolStripMenuItem_Click), + ((ExternalTool)o).Path); + item.Tag = "tool"; + toolsMenu.DropDownItems.Insert(bFirst ? 0 : 1, item); + bFirst = false; + } } } 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 Jun 3 13:41:47 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.53")] -[assembly: AssemblyFileVersion("1.0.2.53")] +[assembly: AssemblyVersion("1.0.2.54")] +[assembly: AssemblyFileVersion("1.0.2.54")]

1 0

[cwittich] 41267: -remove unused app.config from project -attempt to fix external tool list
by cwittich＠svn.reactos.org 03 Jun '09

03 Jun '09

Author: cwittich Date: Wed Jun 3 12:08:30 2009 New Revision: 41267 URL: http://svn.reactos.org/svn/reactos?rev=41267&view=rev Log: -remove unused app.config from project -attempt to fix external tool list Modified: trunk/tools/reactosdbg/RosDBG/ExtTools.cs trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs trunk/tools/reactosdbg/RosDBG/RosDBG.csproj Modified: trunk/tools/reactosdbg/RosDBG/ExtTools.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/ExtTools.c… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/ExtTools.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/ExtTools.cs [iso-8859-1] Wed Jun 3 12:08:30 2009 @@ -17,6 +17,7 @@ { private ExternalToolList mExternalToolsList; private bool mUpdatingList = false; + private bool mAddRemove = false; public ExtTools() { @@ -36,11 +37,12 @@ private void btnAdd_Click(object sender, EventArgs e) { + mAddRemove = true; ExternalTool t = new ExternalTool(); - mExternalToolsList.Add(t); ToolsListBox.Items.Add(t); ToolsListBox.SelectedIndex = ToolsListBox.Items.Count - 1; btnRemove.Enabled = true; + mAddRemove = false; } private void ExtTools_Load(object sender, EventArgs e) @@ -50,7 +52,7 @@ mExternalToolsList = new ExternalToolList(); foreach (object o in mExternalToolsList) - ToolsListBox.Items.Add(o); + ToolsListBox.Items.Add((ExternalTool) o); } private void btnRemove_Click(object sender, EventArgs e) @@ -67,13 +69,16 @@ } } - private void SaveItem(ExternalTool item, int Idx) - { - mUpdatingList = true; - item.Title = txtTitle.Text; - item.Path = txtPath.Text; - ToolsListBox.Items[Idx] = item; - mUpdatingList = false; + private void SaveItem(int Idx) + { + if (!mAddRemove) + { + ExternalTool item = new ExternalTool(txtTitle.Text, txtPath.Text); + mUpdatingList = true; + ToolsListBox.Items[Idx] = item; + mExternalToolsList[Idx] = item; + mUpdatingList = false; + } } private void ToolsListBox_SelectedIndexChanged(object sender, EventArgs e) @@ -108,20 +113,19 @@ fd.Filter = "Executable files (*.exe)|*.exe"; if (fd.ShowDialog() == DialogResult.OK) { - txtPath.Text = fd.FileName; + txtPath.Text = fd.FileName; + SaveItem(ToolsListBox.SelectedIndex); } } private void txtTitle_TextChanged(object sender, EventArgs e) { - if (ToolsListBox.SelectedItem != null) - SaveItem((ExternalTool)ToolsListBox.SelectedItem, ToolsListBox.SelectedIndex); + SaveItem(ToolsListBox.SelectedIndex); } private void txtPath_TextChanged(object sender, EventArgs e) { - if (ToolsListBox.SelectedItem != null) - SaveItem((ExternalTool)ToolsListBox.SelectedItem, ToolsListBox.SelectedIndex); + SaveItem(ToolsListBox.SelectedIndex); } } 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 Jun 3 12:08:30 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.51")] -[assembly: AssemblyFileVersion("1.0.2.51")] +[assembly: AssemblyVersion("1.0.2.53")] +[assembly: AssemblyFileVersion("1.0.2.53")] 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] Wed Jun 3 12:08:30 2009 @@ -314,7 +314,6 @@ </ItemGroup> <ItemGroup> <Content Include="app-rosdbg.ico" /> - <None Include="app.config" /> <None Include="Resources\copyToolStripMenuItem.Image.png" /> <None Include="Resources\Run.bmp" /> <None Include="Resources\Pause.bmp" />

1 0

[cwittich] 41266: -add external tools menu (for stuff like errlook)
by cwittich＠svn.reactos.org 03 Jun '09

03 Jun '09

Author: cwittich Date: Wed Jun 3 11:32:29 2009 New Revision: 41266 URL: http://svn.reactos.org/svn/reactos?rev=41266&view=rev Log: -add external tools menu (for stuff like errlook) Added: trunk/tools/reactosdbg/RosDBG/ExtTools.Designer.cs (with props) trunk/tools/reactosdbg/RosDBG/ExtTools.cs (with props) trunk/tools/reactosdbg/RosDBG/ExtTools.resx (with props) Modified: trunk/tools/reactosdbg/DebugProtocol/KDBG.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/Properties/Settings.Designer.cs trunk/tools/reactosdbg/RosDBG/RosDBG.csproj trunk/tools/reactosdbg/RosDBG/Settings.cs 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] Wed Jun 3 11:32:29 2009 @@ -18,7 +18,7 @@ Dictionary<string, ulong> mModuleList = new Dictionary<string, ulong>(); ulong []mRegisters = new ulong[32]; - public KDBG(Pipe connection) + public KDBG(Pipe connection) { mConnection = connection; mConnection.PipeReceiveEvent += PipeReceiveEvent; Added: trunk/tools/reactosdbg/RosDBG/ExtTools.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/ExtTools.D… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/ExtTools.Designer.cs (added) +++ trunk/tools/reactosdbg/RosDBG/ExtTools.Designer.cs [iso-8859-1] Wed Jun 3 11:32:29 2009 @@ -1,0 +1,209 @@ +ï»¿namespace RosDBG +{ + partial class ExtTools + { + /// <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 Windows Form 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.btnOK = new System.Windows.Forms.Button(); + this.btnCancel = new System.Windows.Forms.Button(); + this.ToolsListBox = new System.Windows.Forms.ListBox(); + this.btnAdd = new System.Windows.Forms.Button(); + this.btnRemove = new System.Windows.Forms.Button(); + this.txtTitle = new System.Windows.Forms.TextBox(); + this.titleLabel = new System.Windows.Forms.Label(); + this.txtPath = new System.Windows.Forms.TextBox(); + this.label1 = new System.Windows.Forms.Label(); + this.btnBrowse = new System.Windows.Forms.Button(); + this.btnUp = new System.Windows.Forms.Button(); + this.btnDown = new System.Windows.Forms.Button(); + this.SuspendLayout(); + // + // btnOK + // + this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK; + this.btnOK.Location = new System.Drawing.Point(171, 285); + this.btnOK.Name = "btnOK"; + this.btnOK.Size = new System.Drawing.Size(89, 27); + this.btnOK.TabIndex = 4; + this.btnOK.Text = "&OK"; + this.btnOK.UseVisualStyleBackColor = true; + this.btnOK.Click += new System.EventHandler(this.btnOK_Click); + // + // btnCancel + // + this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.btnCancel.Location = new System.Drawing.Point(266, 285); + this.btnCancel.Name = "btnCancel"; + this.btnCancel.Size = new System.Drawing.Size(89, 27); + this.btnCancel.TabIndex = 3; + this.btnCancel.Text = "&Cancel"; + this.btnCancel.UseVisualStyleBackColor = true; + this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click); + // + // ToolsListBox + // + this.ToolsListBox.FormattingEnabled = true; + this.ToolsListBox.Location = new System.Drawing.Point(12, 12); + this.ToolsListBox.Name = "ToolsListBox"; + this.ToolsListBox.Size = new System.Drawing.Size(248, 186); + this.ToolsListBox.TabIndex = 5; + this.ToolsListBox.SelectedIndexChanged += new System.EventHandler(this.ToolsListBox_SelectedIndexChanged); + // + // btnAdd + // + this.btnAdd.Location = new System.Drawing.Point(266, 12); + this.btnAdd.Name = "btnAdd"; + this.btnAdd.Size = new System.Drawing.Size(89, 27); + this.btnAdd.TabIndex = 6; + this.btnAdd.Text = "&Add"; + this.btnAdd.UseVisualStyleBackColor = true; + this.btnAdd.Click += new System.EventHandler(this.btnAdd_Click); + // + // btnRemove + // + this.btnRemove.Location = new System.Drawing.Point(266, 45); + this.btnRemove.Name = "btnRemove"; + this.btnRemove.Size = new System.Drawing.Size(89, 27); + this.btnRemove.TabIndex = 7; + this.btnRemove.Text = "&Remove"; + this.btnRemove.UseVisualStyleBackColor = true; + this.btnRemove.Click += new System.EventHandler(this.btnRemove_Click); + // + // txtTitle + // + this.txtTitle.Enabled = false; + this.txtTitle.Location = new System.Drawing.Point(82, 218); + this.txtTitle.Name = "txtTitle"; + this.txtTitle.Size = new System.Drawing.Size(273, 20); + this.txtTitle.TabIndex = 8; + this.txtTitle.TextChanged += new System.EventHandler(this.txtTitle_TextChanged); + // + // titleLabel + // + this.titleLabel.AutoSize = true; + this.titleLabel.Location = new System.Drawing.Point(12, 221); + this.titleLabel.Name = "titleLabel"; + this.titleLabel.Size = new System.Drawing.Size(30, 13); + this.titleLabel.TabIndex = 9; + this.titleLabel.Text = "Title:"; + // + // txtPath + // + this.txtPath.Enabled = false; + this.txtPath.Location = new System.Drawing.Point(82, 244); + this.txtPath.Name = "txtPath"; + this.txtPath.Size = new System.Drawing.Size(235, 20); + this.txtPath.TabIndex = 10; + this.txtPath.TextChanged += new System.EventHandler(this.txtPath_TextChanged); + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(12, 251); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(32, 13); + this.label1.TabIndex = 11; + this.label1.Text = "Path:"; + // + // btnBrowse + // + this.btnBrowse.Enabled = false; + this.btnBrowse.Location = new System.Drawing.Point(323, 244); + this.btnBrowse.Name = "btnBrowse"; + this.btnBrowse.Size = new System.Drawing.Size(32, 21); + this.btnBrowse.TabIndex = 12; + this.btnBrowse.Text = "..."; + this.btnBrowse.UseVisualStyleBackColor = true; + this.btnBrowse.Click += new System.EventHandler(this.btnBrowse_Click); + // + // btnUp + // + this.btnUp.Enabled = false; + this.btnUp.Location = new System.Drawing.Point(266, 135); + this.btnUp.Name = "btnUp"; + this.btnUp.Size = new System.Drawing.Size(89, 27); + this.btnUp.TabIndex = 13; + this.btnUp.Text = "&Up"; + this.btnUp.UseVisualStyleBackColor = true; + // + // btnDown + // + this.btnDown.Enabled = false; + this.btnDown.Location = new System.Drawing.Point(266, 168); + this.btnDown.Name = "btnDown"; + this.btnDown.Size = new System.Drawing.Size(89, 27); + this.btnDown.TabIndex = 14; + this.btnDown.Text = "&Down"; + this.btnDown.UseVisualStyleBackColor = true; + // + // ExtTools + // + this.AcceptButton = this.btnOK; + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.CancelButton = this.btnCancel; + this.ClientSize = new System.Drawing.Size(367, 324); + this.Controls.Add(this.btnDown); + this.Controls.Add(this.btnUp); + this.Controls.Add(this.btnBrowse); + this.Controls.Add(this.label1); + this.Controls.Add(this.txtPath); + this.Controls.Add(this.titleLabel); + this.Controls.Add(this.txtTitle); + this.Controls.Add(this.btnRemove); + this.Controls.Add(this.btnAdd); + this.Controls.Add(this.ToolsListBox); + this.Controls.Add(this.btnOK); + this.Controls.Add(this.btnCancel); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.MaximizeBox = false; + this.MinimizeBox = false; + this.Name = "ExtTools"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; + this.Text = "External Tools"; + this.Load += new System.EventHandler(this.ExtTools_Load); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.Button btnOK; + private System.Windows.Forms.Button btnCancel; + private System.Windows.Forms.ListBox ToolsListBox; + private System.Windows.Forms.Button btnAdd; + private System.Windows.Forms.Button btnRemove; + private System.Windows.Forms.TextBox txtTitle; + private System.Windows.Forms.Label titleLabel; + private System.Windows.Forms.TextBox txtPath; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Button btnBrowse; + private System.Windows.Forms.Button btnUp; + private System.Windows.Forms.Button btnDown; + } +} Propchange: trunk/tools/reactosdbg/RosDBG/ExtTools.Designer.cs ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/tools/reactosdbg/RosDBG/ExtTools.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/ExtTools.c… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/ExtTools.cs (added) +++ trunk/tools/reactosdbg/RosDBG/ExtTools.cs [iso-8859-1] Wed Jun 3 11:32:29 2009 @@ -1,0 +1,213 @@ +ï»¿using System; +using System.Collections; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Xml; +using System.Xml.Serialization; +using System.Windows.Forms; + +namespace RosDBG +{ + + public partial class ExtTools : Form + { + private ExternalToolList mExternalToolsList; + private bool mUpdatingList = false; + + public ExtTools() + { + InitializeComponent(); + } + + private void btnCancel_Click(object sender, EventArgs e) + { + Close(); + } + + private void btnOK_Click(object sender, EventArgs e) + { + Settings.ExternalTools = mExternalToolsList; + Close(); + } + + private void btnAdd_Click(object sender, EventArgs e) + { + ExternalTool t = new ExternalTool(); + mExternalToolsList.Add(t); + ToolsListBox.Items.Add(t); + ToolsListBox.SelectedIndex = ToolsListBox.Items.Count - 1; + btnRemove.Enabled = true; + } + + private void ExtTools_Load(object sender, EventArgs e) + { + mExternalToolsList = Settings.ExternalTools; + if (mExternalToolsList == null) + mExternalToolsList = new ExternalToolList(); + + foreach (object o in mExternalToolsList) + ToolsListBox.Items.Add(o); + } + + private void btnRemove_Click(object sender, EventArgs e) + { + if ((ToolsListBox.Items.Count > 0) && (ToolsListBox.SelectedIndex != -1)) + { + int Idx = ToolsListBox.SelectedIndex; + ToolsListBox.Items.RemoveAt(Idx); + mExternalToolsList.RemoveAt(Idx); + if ((ToolsListBox.Items.Count > 0) && (Idx > 0)) + ToolsListBox.SelectedIndex = Idx - 1; + else + btnRemove.Enabled = false; + } + } + + private void SaveItem(ExternalTool item, int Idx) + { + mUpdatingList = true; + item.Title = txtTitle.Text; + item.Path = txtPath.Text; + ToolsListBox.Items[Idx] = item; + mUpdatingList = false; + } + + private void ToolsListBox_SelectedIndexChanged(object sender, EventArgs e) + { + if (!mUpdatingList) + { + ExternalTool et = (ExternalTool)ToolsListBox.SelectedItem; + if (et != null) + { + txtTitle.Enabled = true; + txtPath.Enabled = true; + btnBrowse.Enabled = true; + txtTitle.Text = et.Title; + txtPath.Text = et.Path; + btnUp.Enabled = (ToolsListBox.SelectedIndex != 0); + btnDown.Enabled = (ToolsListBox.SelectedIndex != ToolsListBox.Items.Count - 1); + } + else + { + txtTitle.Enabled = false; + txtPath.Enabled = false; + btnBrowse.Enabled = false; + txtTitle.Text = ""; + txtPath.Text = ""; + } + } + } + + private void btnBrowse_Click(object sender, EventArgs e) + { + FileDialog fd = new OpenFileDialog(); + fd.Filter = "Executable files (*.exe)|*.exe"; + if (fd.ShowDialog() == DialogResult.OK) + { + txtPath.Text = fd.FileName; + } + } + + private void txtTitle_TextChanged(object sender, EventArgs e) + { + if (ToolsListBox.SelectedItem != null) + SaveItem((ExternalTool)ToolsListBox.SelectedItem, ToolsListBox.SelectedIndex); + } + + private void txtPath_TextChanged(object sender, EventArgs e) + { + if (ToolsListBox.SelectedItem != null) + SaveItem((ExternalTool)ToolsListBox.SelectedItem, ToolsListBox.SelectedIndex); + } + } + + [Serializable] + public class ExternalToolList : ArrayList, IXmlSerializable + { + public System.Xml.Schema.XmlSchema GetSchema() + { + return null; + } + + public void ReadXml(System.Xml.XmlReader reader) + { + this.Clear(); + XmlSerializer x = new XmlSerializer(typeof(ExternalTool)); + while (reader.ReadToFollowing("ExternalTool")) + { + object o = x.Deserialize(reader); + if (o is ExternalTool) this.Add(o); + } + } + + public void WriteXml(System.Xml.XmlWriter writer) + { + XmlSerializer x = new XmlSerializer(typeof(ExternalTool)); + foreach (ExternalTool et in this) + x.Serialize(writer, et); + } + } + + public class ExternalTool : IXmlSerializable + { + private string mTitle; + private string mPath; + + public ExternalTool() + { + mTitle = "[New Tool]"; + mPath = ""; + } + + public ExternalTool(string Title, string Path) + { + mTitle = Title; + mPath = Path; + } + + public string Title + { + get { return mTitle; } + set { mTitle = value; } + } + + public string Path + { + get { return mPath; } + set { mPath = value; } + } + + public override string ToString() + { + return mTitle; + } + + public System.Xml.Schema.XmlSchema GetSchema() + { + return null; + } + + public void ReadXml(System.Xml.XmlReader reader) + { + if (reader.MoveToAttribute("Title")) + mTitle = reader.Value; + else + throw new Exception(); + if (reader.MoveToAttribute("Path")) + mPath = reader.Value; + else + throw new Exception(); + } + + public void WriteXml(System.Xml.XmlWriter writer) + { + writer.WriteAttributeString("Title", mTitle); + writer.WriteAttributeString("Path", mPath); + } + } + +} Propchange: trunk/tools/reactosdbg/RosDBG/ExtTools.cs ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/tools/reactosdbg/RosDBG/ExtTools.resx URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/ExtTools.r… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/ExtTools.resx (added) +++ trunk/tools/reactosdbg/RosDBG/ExtTools.resx [iso-8859-1] Wed Jun 3 11:32:29 2009 @@ -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> Propchange: trunk/tools/reactosdbg/RosDBG/ExtTools.resx ------------------------------------------------------------------------------ svn:eol-style = native 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 Jun 3 11:32:29 2009 @@ -30,21 +30,21 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainWindow)); - WeifenLuo.WinFormsUI.Docking.DockPanelSkin dockPanelSkin1 = new WeifenLuo.WinFormsUI.Docking.DockPanelSkin(); - WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin autoHideStripSkin1 = new WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin(); - WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient1 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient1 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin dockPaneStripSkin1 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin(); - WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient dockPaneStripGradient1 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient2 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient2 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient3 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient dockPaneStripToolWindowGradient1 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient4 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient5 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient3 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient6 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient7 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.DockPanelSkin dockPanelSkin2 = new WeifenLuo.WinFormsUI.Docking.DockPanelSkin(); + WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin autoHideStripSkin2 = new WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin(); + WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient4 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient8 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin dockPaneStripSkin2 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin(); + WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient dockPaneStripGradient2 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient9 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient5 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient10 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient dockPaneStripToolWindowGradient2 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient11 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient12 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient6 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient13 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient14 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); this.menuStrip = new System.Windows.Forms.MenuStrip(); this.fileMenu = new System.Windows.Forms.ToolStripMenuItem(); this.openToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -77,6 +77,8 @@ this.toolBarToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.statusBarToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolsMenu = new System.Windows.Forms.ToolStripMenuItem(); + this.externalToolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem5 = new System.Windows.Forms.ToolStripSeparator(); this.optionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.helpMenu = new System.Windows.Forms.ToolStripMenuItem(); this.contentsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -369,15 +371,29 @@ // toolsMenu // this.toolsMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.externalToolsToolStripMenuItem, + this.toolStripMenuItem5, this.optionsToolStripMenuItem}); this.toolsMenu.Name = "toolsMenu"; this.toolsMenu.Size = new System.Drawing.Size(49, 20); this.toolsMenu.Text = "&Extras"; // + // externalToolsToolStripMenuItem + // + this.externalToolsToolStripMenuItem.Name = "externalToolsToolStripMenuItem"; + this.externalToolsToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.externalToolsToolStripMenuItem.Text = "Exte&rnal Tools"; + this.externalToolsToolStripMenuItem.Click += new System.EventHandler(this.externalToolsToolStripMenuItem_Click); + // + // toolStripMenuItem5 + // + this.toolStripMenuItem5.Name = "toolStripMenuItem5"; + this.toolStripMenuItem5.Size = new System.Drawing.Size(149, 6); + // // optionsToolStripMenuItem // this.optionsToolStripMenuItem.Name = "optionsToolStripMenuItem"; - this.optionsToolStripMenuItem.Size = new System.Drawing.Size(116, 22); + this.optionsToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.optionsToolStripMenuItem.Text = "&Settings"; this.optionsToolStripMenuItem.Click += new System.EventHandler(this.optionsToolStripMenuItem_Click); // @@ -533,50 +549,50 @@ this.dockPanel.Location = new System.Drawing.Point(0, 49); this.dockPanel.Name = "dockPanel"; this.dockPanel.Size = new System.Drawing.Size(784, 490); - dockPanelGradient1.EndColor = System.Drawing.SystemColors.ControlLight; - dockPanelGradient1.StartColor = System.Drawing.SystemColors.ControlLight; - autoHideStripSkin1.DockStripGradient = dockPanelGradient1; - tabGradient1.EndColor = System.Drawing.SystemColors.Control; - tabGradient1.StartColor = System.Drawing.SystemColors.Control; - tabGradient1.TextColor = System.Drawing.SystemColors.ControlDarkDark; - autoHideStripSkin1.TabGradient = tabGradient1; - dockPanelSkin1.AutoHideStripSkin = autoHideStripSkin1; - tabGradient2.EndColor = System.Drawing.SystemColors.ControlLightLight; - tabGradient2.StartColor = System.Drawing.SystemColors.ControlLightLight; - tabGradient2.TextColor = System.Drawing.SystemColors.ControlText; - dockPaneStripGradient1.ActiveTabGradient = tabGradient2; - dockPanelGradient2.EndColor = System.Drawing.SystemColors.Control; - dockPanelGradient2.StartColor = System.Drawing.SystemColors.Control; - dockPaneStripGradient1.DockStripGradient = dockPanelGradient2; - tabGradient3.EndColor = System.Drawing.SystemColors.ControlLight; - tabGradient3.StartColor = System.Drawing.SystemColors.ControlLight; - tabGradient3.TextColor = System.Drawing.SystemColors.ControlText; - dockPaneStripGradient1.InactiveTabGradient = tabGradient3; - dockPaneStripSkin1.DocumentGradient = dockPaneStripGradient1; - tabGradient4.EndColor = System.Drawing.SystemColors.ActiveCaption; - tabGradient4.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical; - tabGradient4.StartColor = System.Drawing.SystemColors.GradientActiveCaption; - tabGradient4.TextColor = System.Drawing.SystemColors.ActiveCaptionText; - dockPaneStripToolWindowGradient1.ActiveCaptionGradient = tabGradient4; - tabGradient5.EndColor = System.Drawing.SystemColors.Control; - tabGradient5.StartColor = System.Drawing.SystemColors.Control; - tabGradient5.TextColor = System.Drawing.SystemColors.ControlText; - dockPaneStripToolWindowGradient1.ActiveTabGradient = tabGradient5; - dockPanelGradient3.EndColor = System.Drawing.SystemColors.ControlLight; - dockPanelGradient3.StartColor = System.Drawing.SystemColors.ControlLight; - dockPaneStripToolWindowGradient1.DockStripGradient = dockPanelGradient3; - tabGradient6.EndColor = System.Drawing.SystemColors.GradientInactiveCaption; - tabGradient6.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical; - tabGradient6.StartColor = System.Drawing.SystemColors.GradientInactiveCaption; - tabGradient6.TextColor = System.Drawing.SystemColors.ControlText; - dockPaneStripToolWindowGradient1.InactiveCaptionGradient = tabGradient6; - tabGradient7.EndColor = System.Drawing.Color.Transparent; - tabGradient7.StartColor = System.Drawing.Color.Transparent; - tabGradient7.TextColor = System.Drawing.SystemColors.ControlDarkDark; - dockPaneStripToolWindowGradient1.InactiveTabGradient = tabGradient7; - dockPaneStripSkin1.ToolWindowGradient = dockPaneStripToolWindowGradient1; - dockPanelSkin1.DockPaneStripSkin = dockPaneStripSkin1; - this.dockPanel.Skin = dockPanelSkin1; + dockPanelGradient4.EndColor = System.Drawing.SystemColors.ControlLight; + dockPanelGradient4.StartColor = System.Drawing.SystemColors.ControlLight; + autoHideStripSkin2.DockStripGradient = dockPanelGradient4; + tabGradient8.EndColor = System.Drawing.SystemColors.Control; + tabGradient8.StartColor = System.Drawing.SystemColors.Control; + tabGradient8.TextColor = System.Drawing.SystemColors.ControlDarkDark; + autoHideStripSkin2.TabGradient = tabGradient8; + dockPanelSkin2.AutoHideStripSkin = autoHideStripSkin2; + tabGradient9.EndColor = System.Drawing.SystemColors.ControlLightLight; + tabGradient9.StartColor = System.Drawing.SystemColors.ControlLightLight; + tabGradient9.TextColor = System.Drawing.SystemColors.ControlText; + dockPaneStripGradient2.ActiveTabGradient = tabGradient9; + dockPanelGradient5.EndColor = System.Drawing.SystemColors.Control; + dockPanelGradient5.StartColor = System.Drawing.SystemColors.Control; + dockPaneStripGradient2.DockStripGradient = dockPanelGradient5; + tabGradient10.EndColor = System.Drawing.SystemColors.ControlLight; + tabGradient10.StartColor = System.Drawing.SystemColors.ControlLight; + tabGradient10.TextColor = System.Drawing.SystemColors.ControlText; + dockPaneStripGradient2.InactiveTabGradient = tabGradient10; + dockPaneStripSkin2.DocumentGradient = dockPaneStripGradient2; + tabGradient11.EndColor = System.Drawing.SystemColors.ActiveCaption; + tabGradient11.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical; + tabGradient11.StartColor = System.Drawing.SystemColors.GradientActiveCaption; + tabGradient11.TextColor = System.Drawing.SystemColors.ActiveCaptionText; + dockPaneStripToolWindowGradient2.ActiveCaptionGradient = tabGradient11; + tabGradient12.EndColor = System.Drawing.SystemColors.Control; + tabGradient12.StartColor = System.Drawing.SystemColors.Control; + tabGradient12.TextColor = System.Drawing.SystemColors.ControlText; + dockPaneStripToolWindowGradient2.ActiveTabGradient = tabGradient12; + dockPanelGradient6.EndColor = System.Drawing.SystemColors.ControlLight; + dockPanelGradient6.StartColor = System.Drawing.SystemColors.ControlLight; + dockPaneStripToolWindowGradient2.DockStripGradient = dockPanelGradient6; + tabGradient13.EndColor = System.Drawing.SystemColors.GradientInactiveCaption; + tabGradient13.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical; + tabGradient13.StartColor = System.Drawing.SystemColors.GradientInactiveCaption; + tabGradient13.TextColor = System.Drawing.SystemColors.ControlText; + dockPaneStripToolWindowGradient2.InactiveCaptionGradient = tabGradient13; + tabGradient14.EndColor = System.Drawing.Color.Transparent; + tabGradient14.StartColor = System.Drawing.Color.Transparent; + tabGradient14.TextColor = System.Drawing.SystemColors.ControlDarkDark; + dockPaneStripToolWindowGradient2.InactiveTabGradient = tabGradient14; + dockPaneStripSkin2.ToolWindowGradient = dockPaneStripToolWindowGradient2; + dockPanelSkin2.DockPaneStripSkin = dockPaneStripSkin2; + this.dockPanel.Skin = dockPanelSkin2; this.dockPanel.TabIndex = 4; this.dockPanel.ActiveDocumentChanged += new System.EventHandler(this.dockPanel_ActiveDocumentChanged); // @@ -594,6 +610,7 @@ this.MainMenuStrip = this.menuStrip; this.Name = "MainWindow"; this.Text = "ReactOS Remote Debugger"; + this.Load += new System.EventHandler(this.MainWindow_Load); this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainWindowMDI_FormClosing); this.menuStrip.ResumeLayout(false); this.menuStrip.PerformLayout(); @@ -630,7 +647,6 @@ private System.Windows.Forms.ToolStripMenuItem toolBarToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem statusBarToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem toolsMenu; - private System.Windows.Forms.ToolStripMenuItem optionsToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem helpMenu; private System.Windows.Forms.ToolStripMenuItem contentsToolStripMenuItem; private System.Windows.Forms.ToolStripButton openToolStripButton; @@ -659,6 +675,9 @@ private System.Windows.Forms.ToolStripSeparator toolStripSeparator6; private System.Windows.Forms.ToolStripButton continueToolStripButton; private System.Windows.Forms.ToolStripButton breakToolStripButton; + private System.Windows.Forms.ToolStripMenuItem externalToolsToolStripMenuItem; + private System.Windows.Forms.ToolStripSeparator toolStripMenuItem5; + private System.Windows.Forms.ToolStripMenuItem optionsToolStripMenuItem; } } 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 Jun 3 11:32:29 2009 @@ -384,6 +384,58 @@ ((ToolWindow)dockPanel.ActiveDocument.DockHandler.Form).Print(false); } + private void externalToolsToolStripMenuItem_Click(object sender, EventArgs e) + { + ExtTools exTools = new ExtTools(); + if (exTools.ShowDialog(this) == DialogResult.OK) + { + Settings.Save(); + UpdateExternalToolsMenu(); + } + } + + private void UpdateExternalToolsMenu() + { + int i = 0; + bool bFirst = true; + while (true) + { + if ((toolsMenu.DropDownItems[i].Tag != null) && + (toolsMenu.DropDownItems[i].Tag.ToString() == "tool")) + toolsMenu.DropDownItems.Remove(toolsMenu.DropDownItems[i]); + else + i++; + if (i >= toolsMenu.DropDownItems.Count - 1) + break; + } + foreach (object o in Settings.ExternalTools) + { + ToolStripMenuItem item = new ToolStripMenuItem(o.ToString(), null, + new System.EventHandler(this.LaunchExternalToolToolStripMenuItem_Click), + ((ExternalTool)o).Path); + item.Tag = "tool"; + toolsMenu.DropDownItems.Insert(bFirst ? 0 : 1, item); + bFirst = false; + } + } + + private void MainWindow_Load(object sender, EventArgs e) + { + UpdateExternalToolsMenu(); + } + + private void LaunchExternalToolToolStripMenuItem_Click(object sender, EventArgs e) + { + try + { + Process.Start(((ToolStripMenuItem)sender).Name); + } + catch (Exception ex) + { + + } + } + } } 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 Jun 3 11:32:29 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.43")] -[assembly: AssemblyFileVersion("1.0.2.43")] +[assembly: AssemblyVersion("1.0.2.51")] +[assembly: AssemblyFileVersion("1.0.2.51")] Modified: trunk/tools/reactosdbg/RosDBG/Properties/Settings.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Properties… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Properties/Settings.Designer.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Properties/Settings.Designer.cs [iso-8859-1] Wed Jun 3 11:32:29 2009 @@ -1,10 +1,10 @@ ï»¿//------------------------------------------------------------------------------ // <auto-generated> -// This code was generated by a tool. -// Runtime Version:2.0.50727.1433 +// Dieser Code wurde von einem Tool generiert. +// Laufzeitversion:2.0.50727.4016 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// Ãnderungen an dieser Datei kÃ¶nnen falsches Verhalten verursachen und gehen verloren, wenn +// der Code erneut generiert wird. // </auto-generated> //------------------------------------------------------------------------------ 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] Wed Jun 3 11:32:29 2009 @@ -108,6 +108,12 @@ <SubType>Code</SubType> </Compile> <Compile Include="DebugInfoFile.cs" /> + <Compile Include="ExtTools.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="ExtTools.Designer.cs"> + <DependentUpon>ExtTools.cs</DependentUpon> + </Compile> <Compile Include="FileDirChooser.cs"> </Compile> <Compile Include="Dockable Objects\ToolWindow.cs"> @@ -167,6 +173,9 @@ <EmbeddedResource Include="Dockable Objects\Locals.resx"> <DependentUpon>Locals.cs</DependentUpon> <SubType>Designer</SubType> + </EmbeddedResource> + <EmbeddedResource Include="ExtTools.resx"> + <DependentUpon>ExtTools.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="MainWindow.resx"> <DependentUpon>MainWindow.cs</DependentUpon> @@ -305,6 +314,7 @@ </ItemGroup> <ItemGroup> <Content Include="app-rosdbg.ico" /> + <None Include="app.config" /> <None Include="Resources\copyToolStripMenuItem.Image.png" /> <None Include="Resources\Run.bmp" /> <None Include="Resources\Pause.bmp" /> Modified: trunk/tools/reactosdbg/RosDBG/Settings.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Settings.c… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Settings.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Settings.cs [iso-8859-1] Wed Jun 3 11:32:29 2009 @@ -1,4 +1,5 @@ ï»¿using System; +using System.Collections; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -20,6 +21,14 @@ private SerialConnSettings _serialconnsettings; private PipeConnSettings _pipeconnsettings; + [UserScopedSetting()] + [Browsable(false)] + public ExternalToolList ExternalTools + { + get { return (ExternalToolList)this["ExternalTools"]; } + set { this["ExternalTools"] = (ExternalToolList)value; } + } + [UserScopedSetting, DefaultSettingValue("0")] [Browsable(false)] public Connect.ConnectionType SelectedConnType @@ -262,9 +271,15 @@ public static string Baudrate { get { return mProperties.Baudrate; } } public static string AppLogging { get { return mProperties.AppLogging; } } public static string AppLogFile { get { return mProperties.AppLogFile; } } - public static Connect.ConnectionType SelectedConnType { + public static Connect.ConnectionType SelectedConnType + { get { return mProperties.SelectedConnType; } set { mProperties.SelectedConnType = value; } + } + public static ExternalToolList ExternalTools + { + get { return mProperties.ExternalTools; } + set { mProperties.ExternalTools = value; } } public Settings()

1 0

[cgutman] 41265: - Remove an incorrect comment (I wasn't thinking when I wrote it ; )) - Add an ASSERT for an unhandled case
by cgutman＠svn.reactos.org 03 Jun '09

03 Jun '09

Author: cgutman Date: Wed Jun 3 05:48:47 2009 New Revision: 41265 URL: http://svn.reactos.org/svn/reactos?rev=41265&view=rev Log: - Remove an incorrect comment (I wasn't thinking when I wrote it ;)) - Add an ASSERT for an unhandled case Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Wed Jun 3 05:48:47 2009 @@ -441,7 +441,6 @@ KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); - /* Should we free this before or after calling SendComplete? */ if (Adapter->NdisMiniportBlock.ScatterGatherListSize != 0) { NDIS_DbgPrint(MAX_TRACE, ("Freeing Scatter/Gather list\n")); @@ -684,6 +683,8 @@ KeLowerIrql(OldIrql); /* FIXME: Wait in pending case! */ + + ASSERT(NdisStatus != NDIS_STATUS_PENDING); return NdisStatus; }

1 0

[dgorbachev] 41264: Do not crash on software breakpoint in kdb.
by dgorbachev＠svn.reactos.org 02 Jun '09

02 Jun '09

Author: dgorbachev Date: Wed Jun 3 02:14:46 2009 New Revision: 41264 URL: http://svn.reactos.org/svn/reactos?rev=41264&view=rev Log: Do not crash on software breakpoint in kdb. Modified: trunk/reactos/ntoskrnl/kd/i386/kdmemsup.c Modified: trunk/reactos/ntoskrnl/kd/i386/kdmemsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/i386/kdmemsup.… ============================================================================== --- trunk/reactos/ntoskrnl/kd/i386/kdmemsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/i386/kdmemsup.c [iso-8859-1] Wed Jun 3 02:14:46 2009 @@ -15,16 +15,24 @@ #define PAGE_TABLE_MASK 0x3ff #define BIG_PAGE_SIZE (1<<22) #define CR4_PAGE_SIZE_BIT 0x10 -#define PDE_PRESENT_BIT 1 -#define PDE_W_BIT 2 +#define PDE_PRESENT_BIT 0x01 +#define PDE_W_BIT 0x02 +#define PDE_PWT_BIT 0x08 +#define PDE_PCD_BIT 0x10 +#define PDE_ACCESSED_BIT 0x20 +#define PDE_DIRTY_BIT 0x40 #define PDE_PS_BIT 0x80 +#define MI_KDBG_TMP_PAGE_1 (HYPER_SPACE + 0x400000 - PAGE_SIZE) +#define MI_KDBG_TMP_PAGE_0 (MI_KDBG_TMP_PAGE_1 - PAGE_SIZE) + /* VARIABLES ***************************************************************/ +static BOOLEAN KdpPhysAccess = FALSE; + +#if 0 extern ULONG MmGlobalKernelPageDirectory[1024]; -static BOOLEAN KdpPhysAccess = FALSE; ULONG_PTR IdentityMapAddrHigh, IdentityMapAddrLow; -extern PFN_TYPE NTAPI MmAllocEarlyPage(); ULONGLONG FASTCALL @@ -66,7 +74,6 @@ return Result; } - VOID NTAPI KdpPhysWrite(ULONG_PTR Addr, LONG Len, ULONGLONG Value) @@ -103,6 +110,91 @@ __writecr3(OldCR3); __invlpg((PVOID)Addr); } + +#else + +static +ULONG_PTR +KdpPhysMap(ULONG_PTR PhysAddr, LONG Len) +{ + MMPTE TempPte; + PMMPTE PointerPte; + ULONG_PTR VirtAddr; + + TempPte.u.Long = PDE_PRESENT_BIT | PDE_W_BIT | PDE_PWT_BIT | + PDE_PCD_BIT | PDE_ACCESSED_BIT | PDE_DIRTY_BIT; + + if ((PhysAddr & (PAGE_SIZE - 1)) + Len > PAGE_SIZE) + { + TempPte.u.Hard.PageFrameNumber = (PhysAddr >> PAGE_SHIFT) + 1; + PointerPte = MiAddressToPte(MI_KDBG_TMP_PAGE_1); + *PointerPte = TempPte; + VirtAddr = (ULONG_PTR)PointerPte << 10; + __invlpg((PVOID)VirtAddr); + } + + TempPte.u.Hard.PageFrameNumber = PhysAddr >> PAGE_SHIFT; + PointerPte = MiAddressToPte(MI_KDBG_TMP_PAGE_0); + *PointerPte = TempPte; + VirtAddr = (ULONG_PTR)PointerPte << 10; + __invlpg((PVOID)VirtAddr); + + return VirtAddr + (PhysAddr & (PAGE_SIZE - 1)); +} + +static +ULONGLONG +KdpPhysRead(ULONG_PTR PhysAddr, LONG Len) +{ + ULONG_PTR Addr; + ULONGLONG Result = 0; + + Addr = KdpPhysMap(PhysAddr, Len); + + switch (Len) + { + case 8: + Result = *((PULONGLONG)Addr); + break; + case 4: + Result = *((PULONG)Addr); + break; + case 2: + Result = *((PUSHORT)Addr); + break; + case 1: + Result = *((PUCHAR)Addr); + break; + } + + return Result; +} + +static +VOID +KdpPhysWrite(ULONG_PTR PhysAddr, LONG Len, ULONGLONG Value) +{ + ULONG_PTR Addr; + + Addr = KdpPhysMap(PhysAddr, Len); + + switch (Len) + { + case 8: + *((PULONGLONG)Addr) = Value; + break; + case 4: + *((PULONG)Addr) = Value; + break; + case 2: + *((PUSHORT)Addr) = Value; + break; + case 1: + *((PUCHAR)Addr) = Value; + break; + } +} +#endif BOOLEAN NTAPI @@ -199,6 +291,7 @@ return TRUE; } +#if 0 VOID NTAPI KdpEnableSafeMem() @@ -245,3 +338,13 @@ KdpPhysAccess = TRUE; } + +#else + +VOID +NTAPI +KdpEnableSafeMem(VOID) +{ + KdpPhysAccess = TRUE; +} +#endif

1 0

[gedmurphy] 41263: Rename the Back Trace to Call Stack
by gedmurphy＠svn.reactos.org 02 Jun '09

02 Jun '09

Author: gedmurphy Date: Wed Jun 3 01:15:00 2009 New Revision: 41263 URL: http://svn.reactos.org/svn/reactos?rev=41263&view=rev Log: Rename the Back Trace to Call Stack Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/BackTrace.Designer.cs trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/BackTrace.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Dockable%2… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Dockable Objects/BackTrace.Designer.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Dockable Objects/BackTrace.Designer.cs [iso-8859-1] Wed Jun 3 01:15:00 2009 @@ -53,7 +53,7 @@ this.HideOnClose = true; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Name = "BackTrace"; - this.Text = "Backtrace"; + this.Text = "Call Stack"; this.ResumeLayout(false); } 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 Jun 3 01:15:00 2009 @@ -138,14 +138,14 @@ this.openToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Black; this.openToolStripMenuItem.Name = "openToolStripMenuItem"; this.openToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); - this.openToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.openToolStripMenuItem.Size = new System.Drawing.Size(146, 22); this.openToolStripMenuItem.Text = "&Open"; this.openToolStripMenuItem.Click += new System.EventHandler(this.OpenFile); // // toolStripSeparator3 // this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(145, 6); + this.toolStripSeparator3.Size = new System.Drawing.Size(143, 6); // // saveToolStripMenuItem // @@ -153,21 +153,21 @@ this.saveToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Black; this.saveToolStripMenuItem.Name = "saveToolStripMenuItem"; this.saveToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S))); - this.saveToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.saveToolStripMenuItem.Size = new System.Drawing.Size(146, 22); this.saveToolStripMenuItem.Text = "&Save"; this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click); // // saveAsToolStripMenuItem // this.saveAsToolStripMenuItem.Name = "saveAsToolStripMenuItem"; - this.saveAsToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.saveAsToolStripMenuItem.Size = new System.Drawing.Size(146, 22); this.saveAsToolStripMenuItem.Text = "Save &as"; this.saveAsToolStripMenuItem.Click += new System.EventHandler(this.SaveAsToolStripMenuItem_Click); // // toolStripSeparator4 // this.toolStripSeparator4.Name = "toolStripSeparator4"; - this.toolStripSeparator4.Size = new System.Drawing.Size(145, 6); + this.toolStripSeparator4.Size = new System.Drawing.Size(143, 6); // // printToolStripMenuItem // @@ -175,7 +175,7 @@ this.printToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Black; this.printToolStripMenuItem.Name = "printToolStripMenuItem"; this.printToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.P))); - this.printToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.printToolStripMenuItem.Size = new System.Drawing.Size(146, 22); this.printToolStripMenuItem.Text = "&Print"; this.printToolStripMenuItem.Click += new System.EventHandler(this.printToolStripMenuItem_Click); // @@ -183,18 +183,18 @@ // this.printSetupToolStripMenuItem.Enabled = false; this.printSetupToolStripMenuItem.Name = "printSetupToolStripMenuItem"; - this.printSetupToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.printSetupToolStripMenuItem.Size = new System.Drawing.Size(146, 22); this.printSetupToolStripMenuItem.Text = "Print setup"; // // toolStripSeparator5 // this.toolStripSeparator5.Name = "toolStripSeparator5"; - this.toolStripSeparator5.Size = new System.Drawing.Size(145, 6); + this.toolStripSeparator5.Size = new System.Drawing.Size(143, 6); // // exitToolStripMenuItem // this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; - this.exitToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.exitToolStripMenuItem.Size = new System.Drawing.Size(146, 22); this.exitToolStripMenuItem.Text = "&Exit"; this.exitToolStripMenuItem.Click += new System.EventHandler(this.ExitToolsStripMenuItem_Click); // @@ -331,7 +331,7 @@ // this.backtraceToolStripMenuItem.Name = "backtraceToolStripMenuItem"; this.backtraceToolStripMenuItem.Size = new System.Drawing.Size(178, 22); - this.backtraceToolStripMenuItem.Text = "&Backtrace"; + this.backtraceToolStripMenuItem.Text = "Call Stack"; this.backtraceToolStripMenuItem.Click += new System.EventHandler(this.backtraceToolStripMenuItem_Click); // // webbrowserToolStripMenuItem @@ -395,19 +395,19 @@ // this.contentsToolStripMenuItem.Name = "contentsToolStripMenuItem"; this.contentsToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.F1))); - this.contentsToolStripMenuItem.Size = new System.Drawing.Size(170, 22); + this.contentsToolStripMenuItem.Size = new System.Drawing.Size(168, 22); this.contentsToolStripMenuItem.Text = "&Contents"; this.contentsToolStripMenuItem.Click += new System.EventHandler(this.contentsToolStripMenuItem_Click); // // toolStripSeparator8 // this.toolStripSeparator8.Name = "toolStripSeparator8"; - this.toolStripSeparator8.Size = new System.Drawing.Size(167, 6); + this.toolStripSeparator8.Size = new System.Drawing.Size(165, 6); // // aboutToolStripMenuItem // this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem"; - this.aboutToolStripMenuItem.Size = new System.Drawing.Size(170, 22); + this.aboutToolStripMenuItem.Size = new System.Drawing.Size(168, 22); this.aboutToolStripMenuItem.Text = "&Info..."; this.aboutToolStripMenuItem.Click += new System.EventHandler(this.aboutToolStripMenuItem_Click); // 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 Jun 3 01:15:00 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.40")] -[assembly: AssemblyFileVersion("1.0.2.40")] +[assembly: AssemblyVersion("1.0.2.43")] +[assembly: AssemblyFileVersion("1.0.2.43")]

1 0

[gedmurphy] 41262: - Run pipe server waiting off on a different thread. - Raise an event when a client connects and set up the connection as before. - rosdbg now correctly waits for a connection and auto-connects when it finds one
by gedmurphy＠svn.reactos.org 02 Jun '09

02 Jun '09

Author: gedmurphy Date: Wed Jun 3 01:04:18 2009 New Revision: 41262 URL: http://svn.reactos.org/svn/reactos?rev=41262&view=rev Log: - Run pipe server waiting off on a different thread. - Raise an event when a client connects and set up the connection as before. - rosdbg now correctly waits for a connection and auto-connects when it finds one Modified: trunk/tools/reactosdbg/DebugProtocol/DebugConnection.cs trunk/tools/reactosdbg/Pipe/namedpipe.cs trunk/tools/reactosdbg/Pipe/pipe.cs trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs 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] Wed Jun 3 01:04:18 2009 @@ -223,6 +223,31 @@ mKdb.ThreadListEvent += ThreadListEvent; } + void NamedPipe_ClientConnectedEvent(object sender, EventArgs e) + { + mKdb = new KDBG(mNamedPipe); + Running = true; + ConnectEventHandlers(); + /* retrieve input seperate thread */ + ReadThread = new Thread(mNamedPipe.ReadLoop); + ReadThread.Start(); + WriteThread = new Thread(mNamedPipe.WriteLoop); + WriteThread.Start(); + } + + public void StartPipe(string pipeName, ConnectionMode mode) + { + Close(); + ConnectionMode = Mode.PipeMode; + + mNamedPipe = new NamedPipe(); + mNamedPipe.ClientConnectedEvent += new EventHandler(NamedPipe_ClientConnectedEvent); + mNamedPipe.PipeReceiveEvent +=new PipeReceiveEventHandler(PipeReceiveEvent); + mNamedPipe.PipeErrorEvent +=new PipeErrorEventHandler(MediumErrorEvent); + + mNamedPipe.CreatePipe(pipeName, mode); + } + public void StartTCP(string host, int port) { Close(); @@ -236,30 +261,6 @@ mDnsAsyncResult = Dns.BeginGetHostEntry(host, mDnsLookup, this); } - public void StartPipe(string pipeName, ConnectionMode mode) - { - Close(); - ConnectionMode = Mode.PipeMode; - mNamedPipe = new NamedPipe(); - if (mNamedPipe.CreatePipe(pipeName, mode)) - { - mKdb = new KDBG(mNamedPipe); - mNamedPipe.PipeReceiveEvent += PipeReceiveEvent; - mNamedPipe.PipeErrorEvent += MediumError; - Running = true; - ConnectEventHandlers(); - /* retrieve input seperate thread */ - ReadThread = new Thread(mNamedPipe.ReadLoop); - ReadThread.Start(); - WriteThread = new Thread(mNamedPipe.WriteLoop); - WriteThread.Start(); - } - else - { - ConnectionMode = Mode.ClosedMode; - } - } - public void StartSerial(string port, int baudrate) { Close(); @@ -273,7 +274,7 @@ //create pipe and kdb instances, connect internal receive pipe mMedium = new SerialPipe(mSerialPort); mMedium.PipeReceiveEvent += PipeReceiveEvent; - mMedium.PipeErrorEvent += MediumError; + mMedium.PipeErrorEvent += MediumErrorEvent; mKdb = new KDBG(mMedium); ConnectEventHandlers(); Running = true; @@ -351,8 +352,10 @@ mNamedPipe = null; } Running = false; - ReadThread.Abort(); - WriteThread.Abort(); + if (ReadThread != null) + ReadThread.Abort(); + if (WriteThread != null) + WriteThread.Abort(); break; } @@ -363,7 +366,7 @@ ConnectionMode = Mode.ClosedMode; } - void MediumError(object sender, PipeErrorEventArgs args) + void MediumErrorEvent(object sender, PipeErrorEventArgs args) { Close(); } @@ -373,7 +376,7 @@ if (mAsyncConnect.SocketError == SocketError.Success) { mMedium = new SocketPipe(mSocket); - mMedium.PipeErrorEvent += MediumError; + mMedium.PipeErrorEvent += MediumErrorEvent; mMedium.PipeReceiveEvent += PipeReceiveEvent; mKdb = new KDBG(mMedium); ConnectEventHandlers(); Modified: trunk/tools/reactosdbg/Pipe/namedpipe.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/Pipe/namedpipe.cs… ============================================================================== --- trunk/tools/reactosdbg/Pipe/namedpipe.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/Pipe/namedpipe.cs [iso-8859-1] Wed Jun 3 01:04:18 2009 @@ -16,40 +16,58 @@ MODE_AUTO = 0x00000002 } - public class NamedPipe : Pipe + public class NamedPipe : Pipe, NPipe { public const int PIPE_SIZE = 1024; private PipeStream ioStream; /* stream for io operations */ private String wCommand; /* buffer of a single command line */ private List<String> cmdList; /*list of commands pending to be written */ - + private bool bClientConn; + private Thread waitThread; + + public event EventHandler ClientConnectedEvent; public event PipeReceiveEventHandler PipeReceiveEvent; public event PipeErrorEventHandler PipeErrorEvent; private static ManualResetEvent newWriteData = new ManualResetEvent(false); + public bool IsClientConnected + { + get { return bClientConn; } + } + public NamedPipe() { cmdList = new List<string>(); } - public bool CreateServerPipe(string name) + private void WaitForConnection(object data) + { + NamedPipeServerStream pipeStream = (NamedPipeServerStream)data; + + pipeStream.WaitForConnection(); + + if (pipeStream.IsConnected) + { + ioStream = pipeStream; + bClientConn = true; + + if (ClientConnectedEvent != null) + { + ClientConnectedEvent(this, EventArgs.Empty); + } + } + } + + public void CreateServerPipe(string name) { /* create a pipe and wait for a client */ NamedPipeServerStream sStream = new NamedPipeServerStream(name, PipeDirection.InOut, 1, PipeTransmissionMode.Byte, PipeOptions.Asynchronous, PIPE_SIZE, PIPE_SIZE); - sStream.WaitForConnection(); - - if (sStream.IsConnected) - { - ioStream = sStream; - return true; - } - else - { - return false; - } + + waitThread = new Thread(WaitForConnection); + waitThread.Start(sStream); } public bool CreateClientPipe(string name) @@ -88,33 +106,20 @@ case ConnectionMode.MODE_AUTO: //check if pipe exists, if not create server pipe, wait certain time, check if pipe... //TODO: server-client lookup should time out - while (true) - { - if (CreateClientPipe(name)) - { - break; - } - if (CreateServerPipe(name)) - { - break; - } - } + CreateClientPipe(name); + CreateServerPipe(name); + return true; case ConnectionMode.MODE_CLIENT: - while (!CreateClientPipe(name)) ; + CreateClientPipe(name); /* pipe open, everything fine */ return true; case ConnectionMode.MODE_SERVER: - if (CreateServerPipe(name)) - { - /* wait for a client*/ - + CreateServerPipe(name); return true; - } - break; } return false; } @@ -123,38 +128,48 @@ { if (ioStream != null) ioStream.Close(); + + if (waitThread != null) + waitThread.Abort(); } public void WriteLoop() { - try - { - while (true) - { - if (cmdList.Count > 0) + if (!bClientConn) + { + if (PipeErrorEvent != null) + PipeErrorEvent.Invoke(this, new PipeErrorEventArgs("Client not connected")); + } + else + { + try + { + while (true) { - byte[] wBuf = new byte[cmdList[0].Length]; - UTF8Encoding.UTF8.GetBytes(cmdList[0], 0, cmdList[0].Length, wBuf, 0); - - ioStream.Write(wBuf, 0, cmdList[0].Length); - - /* remove written data from commandlist */ - cmdList.RemoveAt(0); + if (cmdList.Count > 0) + { + byte[] wBuf = new byte[cmdList[0].Length]; + UTF8Encoding.UTF8.GetBytes(cmdList[0], 0, cmdList[0].Length, wBuf, 0); + + ioStream.Write(wBuf, 0, cmdList[0].Length); + + /* remove written data from commandlist */ + cmdList.RemoveAt(0); + } + else if (cmdList.Count == 0) + { + /* wait until new data is signaled */ + newWriteData.Reset(); + newWriteData.WaitOne(); + } } - else if (cmdList.Count == 0) - { - /* wait until new data is signaled */ - newWriteData.Reset(); - newWriteData.WaitOne(); - } - } - } - catch (Exception e) - { - if (PipeErrorEvent != null) - PipeErrorEvent.Invoke(this, new PipeErrorEventArgs(e.Message)); - } - + } + catch (Exception e) + { + if (PipeErrorEvent != null) + PipeErrorEvent.Invoke(this, new PipeErrorEventArgs(e.Message)); + } + } } public void ReadLoop() @@ -162,27 +177,35 @@ byte[] buf = new byte[PIPE_SIZE]; int read = 0; - try - { - while(true) - { - read = ioStream.Read(buf, 0, PIPE_SIZE); - if (read > 0) + if (!bClientConn) + { + if (PipeErrorEvent != null) + PipeErrorEvent.Invoke(this, new PipeErrorEventArgs("Client not connected")); + } + else + { + try + { + while (true) { - if (PipeReceiveEvent != null) - PipeReceiveEvent.Invoke(this, new PipeReceiveEventArgs(UTF8Encoding.UTF8.GetString(buf, 0, read))); + read = ioStream.Read(buf, 0, PIPE_SIZE); + if (read > 0) + { + if (PipeReceiveEvent != null) + PipeReceiveEvent.Invoke(this, new PipeReceiveEventArgs(UTF8Encoding.UTF8.GetString(buf, 0, read))); + } + else + { + /* connecion closed */ + break; + } } - else - { - /* connecion closed */ - break; - } - } - } - catch (Exception e) - { - if (PipeErrorEvent != null) - PipeErrorEvent.Invoke(this, new PipeErrorEventArgs(e.Message)); + } + catch (Exception e) + { + if (PipeErrorEvent != null) + PipeErrorEvent.Invoke(this, new PipeErrorEventArgs(e.Message)); + } } } Modified: trunk/tools/reactosdbg/Pipe/pipe.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/Pipe/pipe.cs?rev=… ============================================================================== --- trunk/tools/reactosdbg/Pipe/pipe.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/Pipe/pipe.cs [iso-8859-1] Wed Jun 3 01:04:18 2009 @@ -31,4 +31,9 @@ event PipeErrorEventHandler PipeErrorEvent; bool Write(string output); } + + public interface NPipe + { + event EventHandler ClientConnectedEvent; + } } 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 Jun 3 01:04:18 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.24")] -[assembly: AssemblyFileVersion("1.0.2.24")] +[assembly: AssemblyVersion("1.0.2.40")] +[assembly: AssemblyFileVersion("1.0.2.40")]

1 0

[gedmurphy] 41261: - Add more missing styles - Patch by Gabriel Ilardi (gabrielilardi at hotmail dot it)
by gedmurphy＠svn.reactos.org 02 Jun '09

02 Jun '09

Author: gedmurphy Date: Wed Jun 3 00:09:00 2009 New Revision: 41261 URL: http://svn.reactos.org/svn/reactos?rev=41261&view=rev Log: - Add more missing styles - Patch by Gabriel Ilardi (gabrielilardi at hotmail dot it) Modified: trunk/reactos/base/applications/taskmgr/lang/bg-BG.rc trunk/reactos/base/applications/taskmgr/lang/cs-CZ.rc trunk/reactos/base/applications/taskmgr/lang/da-DK.rc trunk/reactos/base/applications/taskmgr/lang/de-DE.rc trunk/reactos/base/applications/taskmgr/lang/el-GR.rc trunk/reactos/base/applications/taskmgr/lang/en-US.rc trunk/reactos/base/applications/taskmgr/lang/es-ES.rc trunk/reactos/base/applications/taskmgr/lang/fr-FR.rc trunk/reactos/base/applications/taskmgr/lang/hu-HU.rc trunk/reactos/base/applications/taskmgr/lang/id-ID.rc trunk/reactos/base/applications/taskmgr/lang/it-IT.rc trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc trunk/reactos/base/applications/taskmgr/lang/ko-KR.rc trunk/reactos/base/applications/taskmgr/lang/nl-NL.rc trunk/reactos/base/applications/taskmgr/lang/no-NO.rc trunk/reactos/base/applications/taskmgr/lang/pl-PL.rc trunk/reactos/base/applications/taskmgr/lang/pt-BR.rc trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc trunk/reactos/base/applications/taskmgr/lang/sk-SK.rc trunk/reactos/base/applications/taskmgr/lang/sv-SE.rc trunk/reactos/base/applications/taskmgr/lang/uk-UA.rc trunk/reactos/base/applications/taskmgr/lang/zh-CN.rc Modified: trunk/reactos/base/applications/taskmgr/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/bg-BG.rc [iso-8859-1] Wed Jun 3 00:09:00 2009 @@ -200,7 +200,7 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Íàòîâàðâàíå íà ÖÏÓ",IDC_CPU_USAGE_FRAME,5,5,60,54,WS_TABSTOP, WS_EX_TRANSPARENT + GROUPBOX "Íàòîâàðâàíå íà ÖÏÓ",IDC_CPU_USAGE_FRAME,5,5,60,54,0,WS_EX_TRANSPARENT GROUPBOX "Çàåòà ïàìåò",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT GROUPBOX "Îáùî",IDC_TOTALS_FRAME,5,122,111,39,0,WS_EX_TRANSPARENT GROUPBOX "Çàäåëåíà ïàìåò (K)",IDC_COMMIT_CHARGE_FRAME,5,166,111,39,0,WS_EX_TRANSPARENT @@ -216,7 +216,7 @@ EDITTEXT IDC_TOTALS_PROCESS_COUNT,65,149,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "Îáùî",IDS_COMMIT_CHARGE_TOTAL,12,175,45,8 - LTEXT "Îãðàíè÷åíèå",IDS_COMMIT_CHARGE_LIMIT,12,184,45,8 + LTEXT "Îãðàíè÷åíèå",IDS_COMMIT_CHARGE_LIMIT,12,184,45,8,NOT WS_BORDER LTEXT "Âúðõîâî",IDS_COMMIT_CHARGE_PEAK,12,193,45,8 EDITTEXT IDC_COMMIT_CHARGE_TOTAL,65,174,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP Modified: trunk/reactos/base/applications/taskmgr/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/cs-CZ.rc [iso-8859-1] Wed Jun 3 00:09:00 2009 @@ -200,7 +200,7 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Vyuití CPU",IDC_CPU_USAGE_FRAME,5,5,60,54,WS_TABSTOP, WS_EX_TRANSPARENT + GROUPBOX "Vyuití CPU",IDC_CPU_USAGE_FRAME,5,5,60,54,0,WS_EX_TRANSPARENT GROUPBOX "Vyuití RAM",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT GROUPBOX "Celkem",IDC_TOTALS_FRAME,5,122,111,39,0,WS_EX_TRANSPARENT GROUPBOX "Commit Charge (K)",IDC_COMMIT_CHARGE_FRAME,5,166,111,39,0,WS_EX_TRANSPARENT @@ -216,7 +216,7 @@ EDITTEXT IDC_TOTALS_PROCESS_COUNT,65,149,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "Celkem",IDS_COMMIT_CHARGE_TOTAL,12,175,27,8 - LTEXT "Limit",IDS_COMMIT_CHARGE_LIMIT,12,184,15,8 + LTEXT "Limit",IDS_COMMIT_CHARGE_LIMIT,12,184,15,8,NOT WS_BORDER LTEXT "Vrchol",IDS_COMMIT_CHARGE_PEAK,12,193,34,8 EDITTEXT IDC_COMMIT_CHARGE_TOTAL,65,174,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP Modified: trunk/reactos/base/applications/taskmgr/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/da-DK.rc [iso-8859-1] Wed Jun 3 00:09:00 2009 @@ -199,7 +199,7 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "CPU Forbrug",IDC_CPU_USAGE_FRAME,5,5,60,54,WS_TABSTOP, WS_EX_TRANSPARENT + GROUPBOX "CPU Forbrug",IDC_CPU_USAGE_FRAME,5,5,60,54,0,WS_EX_TRANSPARENT GROUPBOX "Hukommelse Forbrug",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT GROUPBOX "Ialt",IDC_TOTALS_FRAME,5,122,111,39,0,WS_EX_TRANSPARENT GROUPBOX "Aftaget Forbrug (K)",IDC_COMMIT_CHARGE_FRAME,5,166,111,39,0,WS_EX_TRANSPARENT @@ -215,7 +215,7 @@ EDITTEXT IDC_TOTALS_PROCESS_COUNT,65,149,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "Ialt",IDS_COMMIT_CHARGE_TOTAL,12,175,27,8 - LTEXT "Begrænsning",IDS_COMMIT_CHARGE_LIMIT,12,184,15,8 + LTEXT "Begrænsning",IDS_COMMIT_CHARGE_LIMIT,12,184,15,8,NOT WS_BORDER LTEXT "Top",IDS_COMMIT_CHARGE_PEAK,12,193,34,8 EDITTEXT IDC_COMMIT_CHARGE_TOTAL,65,174,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP Modified: trunk/reactos/base/applications/taskmgr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/de-DE.rc [iso-8859-1] Wed Jun 3 00:09:00 2009 @@ -202,7 +202,7 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "CPU-Auslastung",IDC_CPU_USAGE_FRAME,5,5,67,54,WS_TABSTOP, WS_EX_TRANSPARENT + GROUPBOX "CPU-Auslastung",IDC_CPU_USAGE_FRAME,5,5,67,54,0,WS_EX_TRANSPARENT GROUPBOX "Auslagerungsdatei",IDC_MEM_USAGE_FRAME,5,63,67,54,BS_LEFTTEXT, WS_EX_TRANSPARENT //5,63,60,54 GROUPBOX "Insgesamt",IDC_TOTALS_FRAME,5,122,117,39,0,WS_EX_TRANSPARENT GROUPBOX "Zugesicherter Speicher (KB)",IDC_COMMIT_CHARGE_FRAME,5,166,117,39,0,WS_EX_TRANSPARENT @@ -218,7 +218,7 @@ EDITTEXT IDC_TOTALS_PROCESS_COUNT,71,149,48,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "Insgesamt",IDS_COMMIT_CHARGE_TOTAL,12,175,50,8 //27 - LTEXT "Grenzwert",IDS_COMMIT_CHARGE_LIMIT,12,184,50,8 //15 + LTEXT "Grenzwert",IDS_COMMIT_CHARGE_LIMIT,12,184,50,8,NOT WS_BORDER //15 LTEXT "Maximalwert",IDS_COMMIT_CHARGE_PEAK,12,193,50,8 //34 EDITTEXT IDC_COMMIT_CHARGE_TOTAL,71,174,48,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP Modified: trunk/reactos/base/applications/taskmgr/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/el-GR.rc [iso-8859-1] Wed Jun 3 00:09:00 2009 @@ -200,7 +200,7 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "CPU Usage",IDC_CPU_USAGE_FRAME,5,5,60,54,WS_TABSTOP, WS_EX_TRANSPARENT + GROUPBOX "CPU Usage",IDC_CPU_USAGE_FRAME,5,5,60,54,0,WS_EX_TRANSPARENT GROUPBOX "MEM Usage",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT GROUPBOX "Totals",IDC_TOTALS_FRAME,5,122,111,39,0,WS_EX_TRANSPARENT GROUPBOX "Commit Charge (K)",IDC_COMMIT_CHARGE_FRAME,5,166,111,39,0,WS_EX_TRANSPARENT @@ -216,7 +216,7 @@ EDITTEXT IDC_TOTALS_PROCESS_COUNT,65,149,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "Total",IDS_COMMIT_CHARGE_TOTAL,12,175,27,8 - LTEXT "Limit",IDS_COMMIT_CHARGE_LIMIT,12,184,15,8 + LTEXT "Limit",IDS_COMMIT_CHARGE_LIMIT,12,184,15,8,NOT WS_BORDER LTEXT "Peak",IDS_COMMIT_CHARGE_PEAK,12,193,34,8 EDITTEXT IDC_COMMIT_CHARGE_TOTAL,65,174,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP Modified: trunk/reactos/base/applications/taskmgr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/en-US.rc [iso-8859-1] Wed Jun 3 00:09:00 2009 @@ -200,8 +200,8 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "CPU Usage",IDC_CPU_USAGE_FRAME,5,5,60,54,WS_EX_TRANSPARENT - GROUPBOX "MEM Usage",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT + GROUPBOX "CPU Usage",IDC_CPU_USAGE_FRAME,5,5,60,54,0,WS_EX_TRANSPARENT + GROUPBOX "MEM Usage",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT,WS_EX_TRANSPARENT GROUPBOX "Totals",IDC_TOTALS_FRAME,5,122,111,39,0,WS_EX_TRANSPARENT GROUPBOX "Commit Charge (K)",IDC_COMMIT_CHARGE_FRAME,5,166,111,39,0,WS_EX_TRANSPARENT GROUPBOX "Physical Memory (K)",IDC_PHYSICAL_MEMORY_FRAME,131,122,111,39,0,WS_EX_TRANSPARENT @@ -244,10 +244,8 @@ ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP GROUPBOX "CPU Usage History",IDC_CPU_USAGE_HISTORY_FRAME,74,5,168,54,0,WS_EX_TRANSPARENT GROUPBOX "Memory Usage History",IDC_MEMORY_USAGE_HISTORY_FRAME,74,63,168,54,0,WS_EX_TRANSPARENT - PUSHBUTTON "CPU Usage Display",IDC_CPU_USAGE_GRAPH,12,17,47,37,NOT WS_TABSTOP, - WS_EX_CLIENTEDGE - PUSHBUTTON "MEM Usage Display",IDC_MEM_USAGE_GRAPH,12,75,47,37,NOT WS_TABSTOP, - WS_EX_CLIENTEDGE + PUSHBUTTON "CPU Usage Display",IDC_CPU_USAGE_GRAPH,12,17,47,37,NOT WS_TABSTOP,WS_EX_CLIENTEDGE + PUSHBUTTON "MEM Usage Display",IDC_MEM_USAGE_GRAPH,12,75,47,37,NOT WS_TABSTOP,WS_EX_CLIENTEDGE PUSHBUTTON "CPU Usage History",IDC_CPU_USAGE_HISTORY_GRAPH,81,17, 153,37,NOT WS_TABSTOP,WS_EX_CLIENTEDGE PUSHBUTTON "MEM Usage History",IDC_MEM_USAGE_HISTORY_GRAPH,81,75, Modified: trunk/reactos/base/applications/taskmgr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/es-ES.rc [iso-8859-1] Wed Jun 3 00:09:00 2009 @@ -220,7 +220,7 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Uso de CPU",IDC_CPU_USAGE_FRAME,5,5,60,54,WS_TABSTOP, WS_EX_TRANSPARENT + GROUPBOX "Uso de CPU",IDC_CPU_USAGE_FRAME,5,5,60,54,0,WS_EX_TRANSPARENT GROUPBOX "Uso de MEM",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT GROUPBOX "Totales",IDC_TOTALS_FRAME,5,122,111,39,0,WS_EX_TRANSPARENT GROUPBOX "Carga de transacciones (KB)",IDC_COMMIT_CHARGE_FRAME,5,166,111,39,0,WS_EX_TRANSPARENT @@ -236,7 +236,7 @@ EDITTEXT IDC_TOTALS_PROCESS_COUNT,65,149,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "Total",IDS_COMMIT_CHARGE_TOTAL,12,175,27,8 - LTEXT "Límite",IDS_COMMIT_CHARGE_LIMIT,12,184,30,8 + LTEXT "Límite",IDS_COMMIT_CHARGE_LIMIT,12,184,30,8,NOT WS_BORDER LTEXT "Máximo",IDS_COMMIT_CHARGE_PEAK,12,193,34,8 EDITTEXT IDC_COMMIT_CHARGE_TOTAL,65,174,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP Modified: trunk/reactos/base/applications/taskmgr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/fr-FR.rc [iso-8859-1] Wed Jun 3 00:09:00 2009 @@ -200,7 +200,7 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Util. de l'UC",IDC_CPU_USAGE_FRAME,5,5,60,54,WS_TABSTOP, WS_EX_TRANSPARENT + GROUPBOX "Util. de l'UC",IDC_CPU_USAGE_FRAME,5,5,60,54,0,WS_EX_TRANSPARENT GROUPBOX "Util. de la mémoire",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT GROUPBOX "Totaux",IDC_TOTALS_FRAME,5,122,111,39,0,WS_EX_TRANSPARENT GROUPBOX "Charge dédiée (Ko)",IDC_COMMIT_CHARGE_FRAME,5,166,111,39,0,WS_EX_TRANSPARENT @@ -216,7 +216,7 @@ EDITTEXT IDC_TOTALS_PROCESS_COUNT,65,149,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "Total",IDS_COMMIT_CHARGE_TOTAL,12,175,53,8 - LTEXT "Limite",IDS_COMMIT_CHARGE_LIMIT,12,184,53,8 + LTEXT "Limite",IDS_COMMIT_CHARGE_LIMIT,12,184,53,8,NOT WS_BORDER LTEXT "Pic",IDS_COMMIT_CHARGE_PEAK,12,193,53,8 EDITTEXT IDC_COMMIT_CHARGE_TOTAL,65,174,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP Modified: trunk/reactos/base/applications/taskmgr/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/hu-HU.rc [iso-8859-1] Wed Jun 3 00:09:00 2009 @@ -201,7 +201,7 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "CPU használat",IDC_CPU_USAGE_FRAME,5,5,60,54,WS_TABSTOP, WS_EX_TRANSPARENT + GROUPBOX "CPU használat",IDC_CPU_USAGE_FRAME,5,5,60,54,0,WS_EX_TRANSPARENT GROUPBOX "Memória használat",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT GROUPBOX "Totals",IDC_TOTALS_FRAME,5,122,111,39,0,WS_EX_TRANSPARENT GROUPBOX "Commit Charge (K)",IDC_COMMIT_CHARGE_FRAME,5,166,111,39,0,WS_EX_TRANSPARENT @@ -217,7 +217,7 @@ EDITTEXT IDC_TOTALS_PROCESS_COUNT,65,149,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "Összesen",IDS_COMMIT_CHARGE_TOTAL,12,175,27,8 - LTEXT "Limit",IDS_COMMIT_CHARGE_LIMIT,12,184,15,8 + LTEXT "Limit",IDS_COMMIT_CHARGE_LIMIT,12,184,15,8,NOT WS_BORDER LTEXT "Legnagyobb",IDS_COMMIT_CHARGE_PEAK,12,193,34,8 EDITTEXT IDC_COMMIT_CHARGE_TOTAL,65,174,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP Modified: trunk/reactos/base/applications/taskmgr/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/id-ID.rc [iso-8859-1] Wed Jun 3 00:09:00 2009 @@ -199,7 +199,7 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Pemakaian CPU",IDC_CPU_USAGE_FRAME,5,5,60,54,WS_TABSTOP, WS_EX_TRANSPARENT + GROUPBOX "Pemakaian CPU",IDC_CPU_USAGE_FRAME,5,5,60,54,0,WS_EX_TRANSPARENT GROUPBOX "Pemakaian MEM",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT GROUPBOX "Total",IDC_TOTALS_FRAME,5,122,111,39,0,WS_EX_TRANSPARENT GROUPBOX "Commit Charge (K)",IDC_COMMIT_CHARGE_FRAME,5,166,111,39,0,WS_EX_TRANSPARENT @@ -215,7 +215,7 @@ EDITTEXT IDC_TOTALS_PROCESS_COUNT,65,149,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "Total",IDS_COMMIT_CHARGE_TOTAL,12,175,27,8 - LTEXT "Batas",IDS_COMMIT_CHARGE_LIMIT,12,184,15,8 + LTEXT "Batas",IDS_COMMIT_CHARGE_LIMIT,12,184,15,8,NOT WS_BORDER LTEXT "Peak",IDS_COMMIT_CHARGE_PEAK,12,193,34,8 EDITTEXT IDC_COMMIT_CHARGE_TOTAL,65,174,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP Modified: trunk/reactos/base/applications/taskmgr/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/it-IT.rc [iso-8859-1] Wed Jun 3 00:09:00 2009 @@ -200,7 +200,7 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Uso CPU",IDC_CPU_USAGE_FRAME,5,5,60,54,WS_TABSTOP, WS_EX_TRANSPARENT + GROUPBOX "Uso CPU",IDC_CPU_USAGE_FRAME,5,5,60,54,0,WS_EX_TRANSPARENT GROUPBOX "Uso MEM",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT GROUPBOX "Totali",IDC_TOTALS_FRAME,5,122,111,39,0,WS_EX_TRANSPARENT GROUPBOX "Carico scritture (K)",IDC_COMMIT_CHARGE_FRAME,5,166,111,39,0,WS_EX_TRANSPARENT @@ -216,7 +216,7 @@ EDITTEXT IDC_TOTALS_PROCESS_COUNT,65,149,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "Totale",IDS_COMMIT_CHARGE_TOTAL,12,175,27,8 - LTEXT "Limite",IDS_COMMIT_CHARGE_LIMIT,12,184,21,8 + LTEXT "Limite",IDS_COMMIT_CHARGE_LIMIT,12,184,21,8,NOT WS_BORDER LTEXT "Picco",IDS_COMMIT_CHARGE_PEAK,12,193,34,8 EDITTEXT IDC_COMMIT_CHARGE_TOTAL,65,174,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP Modified: trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc [iso-8859-1] Wed Jun 3 00:09:00 2009 @@ -200,7 +200,7 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 9, "MS UI Gothic" BEGIN - GROUPBOX "CPU gpÊ",IDC_CPU_USAGE_FRAME,5,5,60,54,WS_TABSTOP, WS_EX_TRANSPARENT + GROUPBOX "CPU gpÊ",IDC_CPU_USAGE_FRAME,5,5,60,54,0,WS_EX_TRANSPARENT GROUPBOX "gpÊ",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT GROUPBOX "v",IDC_TOTALS_FRAME,5,122,111,39,0,WS_EX_TRANSPARENT GROUPBOX "R~bg `[W (KB)",IDC_COMMIT_CHARGE_FRAME,5,166,111,39,0,WS_EX_TRANSPARENT @@ -216,7 +216,7 @@ EDITTEXT IDC_TOTALS_PROCESS_COUNT,65,149,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "v",IDS_COMMIT_CHARGE_TOTAL,12,175,27,8 - LTEXT "§Àl",IDS_COMMIT_CHARGE_LIMIT,12,184,15,8 + LTEXT "§Àl",IDS_COMMIT_CHARGE_LIMIT,12,184,15,8,NOT WS_BORDER LTEXT "Åål",IDS_COMMIT_CHARGE_PEAK,12,193,34,8 EDITTEXT IDC_COMMIT_CHARGE_TOTAL,65,174,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP Modified: trunk/reactos/base/applications/taskmgr/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/ko-KR.rc [iso-8859-1] Wed Jun 3 00:09:00 2009 @@ -202,7 +202,7 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "CPU »ç¿ë",IDC_CPU_USAGE_FRAME,5,5,60,54,WS_TABSTOP, WS_EX_TRANSPARENT + GROUPBOX "CPU »ç¿ë",IDC_CPU_USAGE_FRAME,5,5,60,54,0,WS_EX_TRANSPARENT GROUPBOX "¸Þ¸ð¸® »ç¿ë",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT GROUPBOX "ÇÕ°è",IDC_TOTALS_FRAME,5,122,111,39,0,WS_EX_TRANSPARENT GROUPBOX "ÇÒ´çµÈ ¸Þ¸ð¸® (K)",IDC_COMMIT_CHARGE_FRAME,5,166,111,39,0,WS_EX_TRANSPARENT @@ -218,7 +218,7 @@ EDITTEXT IDC_TOTALS_PROCESS_COUNT,65,149,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "ÇÕ°è",IDS_COMMIT_CHARGE_TOTAL,12,175,27,8 - LTEXT "ÇÑ°è",IDS_COMMIT_CHARGE_LIMIT,12,184,15,8 + LTEXT "ÇÑ°è",IDS_COMMIT_CHARGE_LIMIT,12,184,15,8,NOT WS_BORDER LTEXT "ÃÖ°í",IDS_COMMIT_CHARGE_PEAK,12,193,34,8 EDITTEXT IDC_COMMIT_CHARGE_TOTAL,65,174,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP Modified: trunk/reactos/base/applications/taskmgr/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/nl-NL.rc [iso-8859-1] Wed Jun 3 00:09:00 2009 @@ -200,7 +200,7 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "CPU",IDC_CPU_USAGE_FRAME,5,5,60,54,WS_TABSTOP, WS_EX_TRANSPARENT + GROUPBOX "CPU",IDC_CPU_USAGE_FRAME,5,5,60,54,0,WS_EX_TRANSPARENT GROUPBOX "Wisselbestand",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT GROUPBOX "Totalen",IDC_TOTALS_FRAME,5,122,111,39,0,WS_EX_TRANSPARENT GROUPBOX "Geheugengebruik (kB)",IDC_COMMIT_CHARGE_FRAME,5,166,111,39,0,WS_EX_TRANSPARENT @@ -216,7 +216,7 @@ EDITTEXT IDC_TOTALS_PROCESS_COUNT,65,149,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "Totaal",IDS_COMMIT_CHARGE_TOTAL,12,175,37,8 - LTEXT "Limiet",IDS_COMMIT_CHARGE_LIMIT,12,184,37,8 + LTEXT "Limiet",IDS_COMMIT_CHARGE_LIMIT,12,184,37,8,NOT WS_BORDER LTEXT "Piek",IDS_COMMIT_CHARGE_PEAK,12,193,37,8 EDITTEXT IDC_COMMIT_CHARGE_TOTAL,65,174,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP Modified: trunk/reactos/base/applications/taskmgr/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/no-NO.rc [iso-8859-1] Wed Jun 3 00:09:00 2009 @@ -200,7 +200,7 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Prosessorbruk",IDC_CPU_USAGE_FRAME,5,5,70,54,WS_TABSTOP, WS_EX_TRANSPARENT + GROUPBOX "Prosessorbruk",IDC_CPU_USAGE_FRAME,5,5,70,54,0,WS_EX_TRANSPARENT GROUPBOX "Minnebruk",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT GROUPBOX "Totalt",IDC_TOTALS_FRAME,5,122,111,39,0,WS_EX_TRANSPARENT GROUPBOX "Tildelt minne (kb)",IDC_COMMIT_CHARGE_FRAME,5,166,111,39,0,WS_EX_TRANSPARENT @@ -216,7 +216,7 @@ EDITTEXT IDC_TOTALS_PROCESS_COUNT,65,149,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "Totalt",IDS_COMMIT_CHARGE_TOTAL,12,175,27,8 - LTEXT "Begrensninger",IDS_COMMIT_CHARGE_LIMIT,12,184,50,8 + LTEXT "Begrensninger",IDS_COMMIT_CHARGE_LIMIT,12,184,50,8,NOT WS_BORDER LTEXT "Topp",IDS_COMMIT_CHARGE_PEAK,12,193,34,8 EDITTEXT IDC_COMMIT_CHARGE_TOTAL,65,174,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP Modified: trunk/reactos/base/applications/taskmgr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/pl-PL.rc [iso-8859-1] Wed Jun 3 00:09:00 2009 @@ -205,7 +205,7 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "U¿ycie procesora",IDC_CPU_USAGE_FRAME,5,5,60,54,WS_TABSTOP, WS_EX_TRANSPARENT + GROUPBOX "U¿ycie procesora",IDC_CPU_USAGE_FRAME,5,5,60,54,0,WS_EX_TRANSPARENT GROUPBOX "U¿ycie pliku stronicowania",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT GROUPBOX "Sumy",IDC_TOTALS_FRAME,5,122,111,39,0,WS_EX_TRANSPARENT GROUPBOX "Pamiêæ zadeklarowana (KB)",IDC_COMMIT_CHARGE_FRAME,5,166,111,39,0,WS_EX_TRANSPARENT @@ -221,7 +221,7 @@ EDITTEXT IDC_TOTALS_PROCESS_COUNT,65,149,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "Razem",IDS_COMMIT_CHARGE_TOTAL,12,175,27,8 - LTEXT "Limit",IDS_COMMIT_CHARGE_LIMIT,12,184,15,8 + LTEXT "Limit",IDS_COMMIT_CHARGE_LIMIT,12,184,15,8,NOT WS_BORDER LTEXT "Szczyt",IDS_COMMIT_CHARGE_PEAK,12,193,34,8 EDITTEXT IDC_COMMIT_CHARGE_TOTAL,65,174,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP Modified: trunk/reactos/base/applications/taskmgr/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/pt-BR.rc [iso-8859-1] Wed Jun 3 00:09:00 2009 @@ -200,7 +200,7 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Uso de CPU",IDC_CPU_USAGE_FRAME,5,5,60,54,WS_TABSTOP, WS_EX_TRANSPARENT + GROUPBOX "Uso de CPU",IDC_CPU_USAGE_FRAME,5,5,60,54,0,WS_EX_TRANSPARENT GROUPBOX "Uso de MEM",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT GROUPBOX "Totais",IDC_TOTALS_FRAME,5,122,111,39,0,WS_EX_TRANSPARENT GROUPBOX "Carga comprometida (K)",IDC_COMMIT_CHARGE_FRAME,5,166,111,39,0,WS_EX_TRANSPARENT @@ -216,7 +216,7 @@ EDITTEXT IDC_TOTALS_PROCESS_COUNT,65,149,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "Total",IDS_COMMIT_CHARGE_TOTAL,12,175,27,8 - LTEXT "Limite",IDS_COMMIT_CHARGE_LIMIT,12,184,19,8 + LTEXT "Limite",IDS_COMMIT_CHARGE_LIMIT,12,184,19,8,NOT WS_BORDER LTEXT "Pico",IDS_COMMIT_CHARGE_PEAK,12,193,34,8 EDITTEXT IDC_COMMIT_CHARGE_TOTAL,65,174,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP Modified: trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc [iso-8859-1] Wed Jun 3 00:09:00 2009 @@ -200,7 +200,7 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Uz proc.",IDC_CPU_USAGE_FRAME,5,5,60,54,WS_TABSTOP, WS_EX_TRANSPARENT + GROUPBOX "Uz proc.",IDC_CPU_USAGE_FRAME,5,5,60,54,0,WS_EX_TRANSPARENT GROUPBOX "Uz mem.",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT GROUPBOX "Total",IDC_TOTALS_FRAME,5,122,111,39,0,WS_EX_TRANSPARENT GROUPBOX "Lucru (K)",IDC_COMMIT_CHARGE_FRAME,5,166,111,39,0,WS_EX_TRANSPARENT @@ -216,7 +216,7 @@ EDITTEXT IDC_TOTALS_PROCESS_COUNT,65,149,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "Total",IDS_COMMIT_CHARGE_TOTAL,12,175,27,8 - LTEXT "Limitã",IDS_COMMIT_CHARGE_LIMIT,12,184,15,8 + LTEXT "Limitã",IDS_COMMIT_CHARGE_LIMIT,12,184,15,8,NOT WS_BORDER LTEXT "Vârf",IDS_COMMIT_CHARGE_PEAK,12,193,34,8 EDITTEXT IDC_COMMIT_CHARGE_TOTAL,65,174,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP Modified: trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc [iso-8859-1] Wed Jun 3 00:09:00 2009 @@ -199,7 +199,7 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Çàãðóçêà ÖÏ",IDC_CPU_USAGE_FRAME,5,5,60,54,WS_TABSTOP, WS_EX_TRANSPARENT + GROUPBOX "Çàãðóçêà ÖÏ",IDC_CPU_USAGE_FRAME,5,5,60,54,0,WS_EX_TRANSPARENT GROUPBOX "Ôàéë ïîäêà÷êè",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT GROUPBOX "Âñåãî",IDC_TOTALS_FRAME,5,122,111,39,0,WS_EX_TRANSPARENT GROUPBOX "Âûäåëåíèå ïàìÿòè (K)",IDC_COMMIT_CHARGE_FRAME,5,166,111,39,0,WS_EX_TRANSPARENT @@ -215,7 +215,7 @@ EDITTEXT IDC_TOTALS_PROCESS_COUNT,65,149,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "Âñåãî",IDS_COMMIT_CHARGE_TOTAL,12,175,27,8 - LTEXT "Ïðåäåë",IDS_COMMIT_CHARGE_LIMIT,12,184,27,8 + LTEXT "Ïðåäåë",IDS_COMMIT_CHARGE_LIMIT,12,184,27,8,NOT WS_BORDER LTEXT "Ïèê",IDS_COMMIT_CHARGE_PEAK,12,193,34,8 EDITTEXT IDC_COMMIT_CHARGE_TOTAL,65,174,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP Modified: trunk/reactos/base/applications/taskmgr/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/sk-SK.rc [iso-8859-1] Wed Jun 3 00:09:00 2009 @@ -199,7 +199,7 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Procesor",IDC_CPU_USAGE_FRAME,5,5,60,54,WS_TABSTOP, WS_EX_TRANSPARENT + GROUPBOX "Procesor",IDC_CPU_USAGE_FRAME,5,5,60,54,0,WS_EX_TRANSPARENT GROUPBOX "Stránkovanie",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT GROUPBOX "Súèty",IDC_TOTALS_FRAME,5,122,89,39,0,WS_EX_TRANSPARENT GROUPBOX "Vyuitie pamäte (kB)",IDC_COMMIT_CHARGE_FRAME,5,166,89,39,0,WS_EX_TRANSPARENT @@ -215,7 +215,7 @@ EDITTEXT IDC_TOTALS_PROCESS_COUNT,54,149,36,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "Celkovo",IDS_COMMIT_CHARGE_TOTAL,12,175,27,8 - LTEXT "Limit",IDS_COMMIT_CHARGE_LIMIT,12,184,15,8 + LTEXT "Limit",IDS_COMMIT_CHARGE_LIMIT,12,184,15,8,NOT WS_BORDER LTEXT "Maximum",IDS_COMMIT_CHARGE_PEAK,12,193,34,8 EDITTEXT IDC_COMMIT_CHARGE_TOTAL,50,174,40,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP Modified: trunk/reactos/base/applications/taskmgr/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/sv-SE.rc [iso-8859-1] Wed Jun 3 00:09:00 2009 @@ -217,7 +217,7 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Processoranv.",IDC_CPU_USAGE_FRAME,5,5,60,54,WS_TABSTOP, WS_EX_TRANSPARENT + GROUPBOX "Processoranv.",IDC_CPU_USAGE_FRAME,5,5,60,54,0,WS_EX_TRANSPARENT GROUPBOX "Minnesanv.",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT GROUPBOX "Totalt",IDC_TOTALS_FRAME,5,122,111,39,0,WS_EX_TRANSPARENT GROUPBOX "Upptaget minne (K)",IDC_COMMIT_CHARGE_FRAME,5,166,111,39,0,WS_EX_TRANSPARENT @@ -233,7 +233,7 @@ EDITTEXT IDC_TOTALS_PROCESS_COUNT,65,149,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "Totalt",IDS_COMMIT_CHARGE_TOTAL,12,175,27,8 - LTEXT "Gräns",IDS_COMMIT_CHARGE_LIMIT,12,184,21,8 + LTEXT "Gräns",IDS_COMMIT_CHARGE_LIMIT,12,184,21,8,NOT WS_BORDER LTEXT "Topp",IDS_COMMIT_CHARGE_PEAK,12,193,34,8 EDITTEXT IDC_COMMIT_CHARGE_TOTAL,65,174,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP Modified: trunk/reactos/base/applications/taskmgr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/uk-UA.rc [iso-8859-1] Wed Jun 3 00:09:00 2009 @@ -200,7 +200,7 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Âèêîðèñòàííÿ ÖÏ",IDC_CPU_USAGE_FRAME,5,5,60,54,WS_TABSTOP, WS_EX_TRANSPARENT + GROUPBOX "Âèêîðèñòàííÿ ÖÏ",IDC_CPU_USAGE_FRAME,5,5,60,54,0,WS_EX_TRANSPARENT GROUPBOX "Âèêîðèñòàííÿ ïàì'ÿò³",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT GROUPBOX "Óñüîãî",IDC_TOTALS_FRAME,5,122,111,39,0,WS_EX_TRANSPARENT GROUPBOX "Âèä³ëåííÿ ïàì'ÿò³ (ÊÁ)",IDC_COMMIT_CHARGE_FRAME,5,166,111,39,0,WS_EX_TRANSPARENT @@ -216,7 +216,7 @@ EDITTEXT IDC_TOTALS_PROCESS_COUNT,65,149,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "Óñüîãî",IDS_COMMIT_CHARGE_TOTAL,12,175,27,8 - LTEXT "Ìåæà",IDS_COMMIT_CHARGE_LIMIT,12,184,15,8 + LTEXT "Ìåæà",IDS_COMMIT_CHARGE_LIMIT,12,184,15,8,NOT WS_BORDER LTEXT "Ï³ê",IDS_COMMIT_CHARGE_PEAK,12,193,34,8 EDITTEXT IDC_COMMIT_CHARGE_TOTAL,65,174,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP Modified: trunk/reactos/base/applications/taskmgr/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/zh-CN.rc [iso-8859-1] Wed Jun 3 00:09:00 2009 @@ -208,7 +208,7 @@ STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "CPU Ê¹ÓÃÇé¿öÏÔÊ¾",IDC_CPU_USAGE_FRAME,5,5,60,54,WS_TABSTOP, WS_EX_TRANSPARENT + GROUPBOX "CPU Ê¹ÓÃÇé¿öÏÔÊ¾",IDC_CPU_USAGE_FRAME,5,5,60,54,0,WS_EX_TRANSPARENT GROUPBOX "PFÊ¹ÓÃÂÊ",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT GROUPBOX "×ÜÊý",IDC_TOTALS_FRAME,5,122,111,39,0,WS_EX_TRANSPARENT GROUPBOX "ÈÏ¿ÉÓÃÁ¿(K)",IDC_COMMIT_CHARGE_FRAME,5,166,111,39,0,WS_EX_TRANSPARENT @@ -224,7 +224,7 @@ EDITTEXT IDC_TOTALS_PROCESS_COUNT,65,149,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "×ÜÊý",IDS_COMMIT_CHARGE_TOTAL,12,175,27,8 - LTEXT "ÏÞÖÆ",IDS_COMMIT_CHARGE_LIMIT,12,184,25,8 + LTEXT "ÏÞÖÆ",IDS_COMMIT_CHARGE_LIMIT,12,184,25,8,NOT WS_BORDER LTEXT "·åÖµ",IDS_COMMIT_CHARGE_PEAK,12,193,34,8 EDITTEXT IDC_COMMIT_CHARGE_TOTAL,65,174,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP

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