Ros-diffs May 2009

ros-diffs@reactos.org

27 participants
504 discussions

[fireball] 41186: - Add missing AVL tree initialization.

by fireball＠svn.reactos.org

Author: fireball Date: Thu May 28 22:59:26 2009 New Revision: 41186 URL: http://svn.reactos.org/svn/reactos?rev=41186&view=rev Log: - Add missing AVL tree initialization. Modified: trunk/reactos/ntoskrnl/mm/i386/page.c trunk/reactos/ntoskrnl/mm/procsup.c Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] Thu May 28 22:59:26 2009 @@ -173,6 +173,8 @@ /* Initialize the Addresss Space */ KeInitializeGuardedMutex(&Process->AddressCreationLock); Process->Vm.WorkingSetExpansionLinks.Flink = NULL; + ASSERT(Process->VadRoot.NumberGenericTableElements == 0); + Process->VadRoot.BalancedRoot.u1.Parent = &Process->VadRoot.BalancedRoot; /* The process now has an address space */ Process->HasAddressSpace = TRUE; Modified: trunk/reactos/ntoskrnl/mm/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/procsup.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/procsup.c [iso-8859-1] Thu May 28 22:59:26 2009 @@ -532,6 +532,10 @@ KeInitializeGuardedMutex(&Process->AddressCreationLock); Process->Vm.WorkingSetExpansionLinks.Flink = NULL; + /* Initialize AVL tree */ + ASSERT(Process->VadRoot.NumberGenericTableElements == 0); + Process->VadRoot.BalancedRoot.u1.Parent = &Process->VadRoot.BalancedRoot; + /* Acquire the Lock */ MmLockAddressSpace(ProcessAddressSpace);

15 years, 7 months

[dgorbachev] 41185: Fix bug #4552, introduced in r40826 by me. Patch by Marcus Boillat (ka6602-280*at*online*dot*de).

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Thu May 28 22:50:40 2009 New Revision: 41185 URL: http://svn.reactos.org/svn/reactos?rev=41185&view=rev Log: Fix bug #4552, introduced in r40826 by me. Patch by Marcus Boillat (ka6602-280*at*online*dot*de). Modified: trunk/reactos/dll/win32/shell32/drive.c Modified: trunk/reactos/dll/win32/shell32/drive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/drive.c?… ============================================================================== --- trunk/reactos/dll/win32/shell32/drive.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/drive.c [iso-8859-1] Thu May 28 22:50:40 2009 @@ -327,7 +327,8 @@ FillRect(drawItem->hDC, &drawItem->rcItem, hBrush); DeleteObject((HGDIOBJ)hBrush); } - }else if (drawItem->CtlID == 14014) + } + else if (drawItem->CtlID == 14014) { hBrush = CreateSolidBrush(RGB(255, 0, 255)); if (hBrush) @@ -348,7 +349,7 @@ hBlueBrush = CreateSolidBrush(RGB(0, 0, 255)); hMagBrush = CreateSolidBrush(RGB(255, 0, 255)); - SendDlgItemMessageW(hwndDlg, 14007, WM_GETTEXT, 20, (LPARAM)szBuffer); + SendDlgItemMessageW(hwndDlg, 14006, WM_GETTEXT, 20, (LPARAM)szBuffer); Result.QuadPart = _wtoi(szBuffer); CopyRect(&rect, &drawItem->rcItem); @@ -385,10 +386,10 @@ if (ret) { /* set volume label */ - SendDlgItemMessageW(hwndDlg, 14001, WM_SETTEXT, (WPARAM)NULL, (LPARAM)szVolumeName); + SendDlgItemMessageW(hwndDlg, 14000, WM_SETTEXT, (WPARAM)NULL, (LPARAM)szVolumeName); /* set filesystem type */ - SendDlgItemMessageW(hwndDlg, 14003, WM_SETTEXT, (WPARAM)NULL, (LPARAM)FileSystemName); + SendDlgItemMessageW(hwndDlg, 14002, WM_SETTEXT, (WPARAM)NULL, (LPARAM)FileSystemName); } @@ -410,39 +411,39 @@ { ret = DeviceIoControl(hVolume, IOCTL_DISK_GET_LENGTH_INFO, NULL, 0, (LPVOID)&TotalNumberOfBytes, sizeof(ULARGE_INTEGER), &BytesReturned, NULL); if (ret && StrFormatByteSizeW(LengthInformation.Length.QuadPart, szResult, sizeof(szResult) / sizeof(WCHAR))) - SendDlgItemMessageW(hwndDlg, 14008, WM_SETTEXT, (WPARAM)NULL, (LPARAM)szResult); + SendDlgItemMessageW(hwndDlg, 14007, WM_SETTEXT, (WPARAM)NULL, (LPARAM)szResult); CloseHandle(hVolume); } TRACE("szResult %s hVOlume %p ret %d LengthInformation %ul Bytesreturned %d\n", debugstr_w(szResult), hVolume, ret, LengthInformation.Length.QuadPart, BytesReturned); #else if (ret && StrFormatByteSizeW(TotalNumberOfBytes.QuadPart, szResult, sizeof(szResult) / sizeof(WCHAR))) - SendDlgItemMessageW(hwndDlg, 14008, WM_SETTEXT, (WPARAM)NULL, (LPARAM)szResult); + SendDlgItemMessageW(hwndDlg, 14007, WM_SETTEXT, (WPARAM)NULL, (LPARAM)szResult); #endif if (StrFormatByteSizeW(TotalNumberOfBytes.QuadPart - FreeBytesAvailable.QuadPart, szResult, sizeof(szResult) / sizeof(WCHAR))) - SendDlgItemMessageW(hwndDlg, 14004, WM_SETTEXT, (WPARAM)NULL, (LPARAM)szResult); + SendDlgItemMessageW(hwndDlg, 14003, WM_SETTEXT, (WPARAM)NULL, (LPARAM)szResult); if (StrFormatByteSizeW(FreeBytesAvailable.QuadPart, szResult, sizeof(szResult) / sizeof(WCHAR))) - SendDlgItemMessageW(hwndDlg, 14006, WM_SETTEXT, (WPARAM)NULL, (LPARAM)szResult); + SendDlgItemMessageW(hwndDlg, 14005, WM_SETTEXT, (WPARAM)NULL, (LPARAM)szResult); Result = GetFreeBytesShare(TotalNumberOfFreeBytes, TotalNumberOfBytes); /* set free bytes percentage */ swprintf(szResult, L"%02d%%", Result.QuadPart); - SendDlgItemMessageW(hwndDlg, 14007, WM_SETTEXT, (WPARAM)0, (LPARAM)szResult); + SendDlgItemMessageW(hwndDlg, 14006, WM_SETTEXT, (WPARAM)0, (LPARAM)szResult); /* store used share amount */ Result = LargeIntegerSubtract(ConvertUlongToLargeInteger(100), Result); swprintf(szResult, L"%02d%%", Result.QuadPart); - SendDlgItemMessageW(hwndDlg, 14005, WM_SETTEXT, (WPARAM)0, (LPARAM)szResult); + SendDlgItemMessageW(hwndDlg, 14004, WM_SETTEXT, (WPARAM)0, (LPARAM)szResult); if (LoadStringW(shell32_hInstance, IDS_DRIVE_FIXED, szBuffer, sizeof(szBuffer) / sizeof(WCHAR))) - SendDlgItemMessageW(hwndDlg, 14002, WM_SETTEXT, (WPARAM)0, (LPARAM)szBuffer); + SendDlgItemMessageW(hwndDlg, 14001, WM_SETTEXT, (WPARAM)0, (LPARAM)szBuffer); } } /* set drive description */ - SendDlgItemMessageW(hwndDlg, 14010, WM_GETTEXT, (WPARAM)50, (LPARAM)szFormat); + SendDlgItemMessageW(hwndDlg, 14009, WM_GETTEXT, (WPARAM)50, (LPARAM)szFormat); swprintf(szBuffer, szFormat, szDrive); - SendDlgItemMessageW(hwndDlg, 14010, WM_SETTEXT, (WPARAM)NULL, (LPARAM)szBuffer); + SendDlgItemMessageW(hwndDlg, 14009, WM_SETTEXT, (WPARAM)NULL, (LPARAM)szBuffer); }

15 years, 7 months

[gedmurphy] 41184: - Setup the diagnostics on app load. - You can now use the static Trace.WriteLine method anywhere within the app to start making use of the log.

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Thu May 28 21:03:31 2009 New Revision: 41184 URL: http://svn.reactos.org/svn/reactos?rev=41184&view=rev Log: - Setup the diagnostics on app load. - You can now use the static Trace.WriteLine method anywhere within the app to start making use of the log. Modified: trunk/tools/reactosdbg/RosDBG/MainWindow.cs trunk/tools/reactosdbg/RosDBG/Settings.cs 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] Thu May 28 21:03:31 2009 @@ -8,6 +8,7 @@ using System.Text; using System.Windows.Forms; using System.Reflection; +using System.Diagnostics; using WeifenLuo.WinFormsUI.Docking; using AbstractPipe; using DebugProtocol; @@ -43,6 +44,29 @@ public MainWindow() { InitializeComponent(); + + // Setup the logger + try + { + if (Convert.ToBoolean(Settings.AppLogging)) + { + File.Delete(Settings.AppLogFile); + FileStream traceLogFile = new FileStream(Settings.AppLogFile, FileMode.OpenOrCreate); + Trace.Listeners.Add(new TextWriterTraceListener(traceLogFile)); + Trace.AutoFlush = true; + } + } + catch (DirectoryNotFoundException) + { + MessageBox.Show(String.Format("Logging: {0} does not exist.\n" + + "Please use the settings dialog to correct this", + Settings.AppLogFile)); + } + catch (Exception ex) + { + MessageBox.Show(String.Format("Failed to setup logging. Unexpected error:\n {0}", + ex.Message)); + } mSymbolContext = new SymbolContext(); 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] Thu May 28 21:03:31 2009 @@ -260,6 +260,8 @@ public static string Pipe { get { return mProperties.Pipe; } } public static string ComPort { get { return mProperties.Port; } } 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 { get { return mProperties.SelectedConnType; } set { mProperties.SelectedConnType = value; }

15 years, 7 months

[gedmurphy] 41183: Add a log file and the ability to turn application logging on and off.

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Thu May 28 20:51:06 2009 New Revision: 41183 URL: http://svn.reactos.org/svn/reactos?rev=41183&view=rev Log: Add a log file and the ability to turn application logging on and off. Added: trunk/tools/reactosdbg/RosDBG/FileDirChooser.cs Removed: trunk/tools/reactosdbg/RosDBG/DirectoryChooser.cs Modified: trunk/tools/reactosdbg/RosDBG/RosDBG.csproj trunk/tools/reactosdbg/RosDBG/Settings.cs Removed: trunk/tools/reactosdbg/RosDBG/DirectoryChooser.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/DirectoryC… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/DirectoryChooser.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/DirectoryChooser.cs (removed) @@ -1,33 +1,0 @@ -ï»¿using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.ComponentModel.Design; -using System.Drawing.Design; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Windows.Forms; -using System.IO; - -namespace RosDBG -{ - public class DirectoryEditor : UITypeEditor - { - public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context) - { - return UITypeEditorEditStyle.Modal; - } - - public override object EditValue(ITypeDescriptorContext typedesc, IServiceProvider provider, object value) - { - FolderBrowserDialog fbd = new FolderBrowserDialog(); - fbd.Description = "Set path for " + typedesc.PropertyDescriptor.DisplayName; - if (fbd.ShowDialog() == DialogResult.OK) - return fbd.SelectedPath; - else - return value; - } - } - -} Added: trunk/tools/reactosdbg/RosDBG/FileDirChooser.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/FileDirCho… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/FileDirChooser.cs (added) +++ trunk/tools/reactosdbg/RosDBG/FileDirChooser.cs [iso-8859-1] Thu May 28 20:51:06 2009 @@ -1,0 +1,57 @@ +ï»¿using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.ComponentModel.Design; +using System.Drawing.Design; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; +using System.IO; + +namespace RosDBG +{ + public class DirectoryEditor : UITypeEditor + { + public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context) + { + return UITypeEditorEditStyle.Modal; + } + + public override object EditValue(ITypeDescriptorContext typedesc, IServiceProvider provider, object value) + { + FolderBrowserDialog fbd = new FolderBrowserDialog(); + fbd.Description = "Set path for " + typedesc.PropertyDescriptor.DisplayName; + if (fbd.ShowDialog() == DialogResult.OK) + return fbd.SelectedPath; + else + return value; + } + } + + public class FileEditor : UITypeEditor + { + public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context) + { + return UITypeEditorEditStyle.Modal; + } + + public override object EditValue(ITypeDescriptorContext typedesc, IServiceProvider provider, object value) + { + OpenFileDialog ofd = new OpenFileDialog(); + + ofd.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments); + ofd.CheckFileExists = false; + ofd.Filter = "log files (*.log)|*.log"; + ofd.DefaultExt = "log"; + ofd.AddExtension = true; + ofd.RestoreDirectory = true; + + if (ofd.ShowDialog() == DialogResult.OK) + return ofd.FileName; + else + return value; + } + } +} 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] Thu May 28 20:51:06 2009 @@ -107,7 +107,7 @@ <SubType>Code</SubType> </Compile> <Compile Include="DebugInfoFile.cs" /> - <Compile Include="DirectoryChooser.cs"> + <Compile Include="FileDirChooser.cs"> </Compile> <Compile Include="Dockable Objects\ToolWindow.cs"> <SubType>Form</SubType> 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] Thu May 28 20:51:06 2009 @@ -106,6 +106,24 @@ set { _pipeconnsettings = value; } } + [Browsable(true)] + [CategoryAttribute("Logging"), DescriptionAttribute("Turn application logging on or off")] + [UserScopedSetting, DefaultSettingValue("true")] + [TypeConverter(typeof(AppLoggingSelection))] + public string AppLogging + { + get { return this["AppLogging"].ToString(); } + set { this["AppLogging"] = value; } + } + + [CategoryAttribute("Logging"), DescriptionAttribute("The log file in which to store the app log")] + [UserScopedSetting, DefaultSettingValue(@".\rosdbg.log"), Editor(typeof(FileEditor), typeof(UITypeEditor))] + public string AppLogFile + { + get { return this["AppLogFile"].ToString(); } + set { this["AppLogFile"] = value; } + } + public SettingsPropertyValues() { Reload(); @@ -149,6 +167,23 @@ } } + internal class AppLoggingSelection : StringConverter + { + public override bool GetStandardValuesSupported(ITypeDescriptorContext context) + { + return true; + } + + public override bool GetStandardValuesExclusive(ITypeDescriptorContext context) + { + return true; + } + + public override StandardValuesCollection GetStandardValues(ITypeDescriptorContext context) + { + return new StandardValuesCollection(new string[] { "true", "false" }); + } + } #endregion [TypeConverterAttribute(typeof(ExpandableObjectConverter))]

15 years, 7 months

[cwittich] 41182: try to fix crash on exit

by cwittich＠svn.reactos.org

Author: cwittich Date: Thu May 28 19:31:12 2009 New Revision: 41182 URL: http://svn.reactos.org/svn/reactos?rev=41182&view=rev Log: try to fix crash on exit Modified: trunk/tools/reactosdbg/RosDBG/MainWindow.cs 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] Thu May 28 19:31:12 2009 @@ -347,13 +347,16 @@ private void dockPanel_ActiveDocumentChanged(object sender, EventArgs e) { - ToolWindow Wnd = (ToolWindow)dockPanel.ActiveDocument.DockHandler.Form; - - saveToolStripButton.Enabled = Wnd.IsCmdEnabled(ToolWindow.Commands.Save); - saveToolStripMenuItem.Enabled = Wnd.IsCmdEnabled(ToolWindow.Commands.Save); - saveAsToolStripMenuItem.Enabled = Wnd.IsCmdEnabled(ToolWindow.Commands.SaveAs); - printToolStripButton.Enabled = Wnd.IsCmdEnabled(ToolWindow.Commands.Print); - printToolStripMenuItem.Enabled = Wnd.IsCmdEnabled(ToolWindow.Commands.Print); + if ((dockPanel != null) && (dockPanel.ActiveDocument != null)) + { + ToolWindow Wnd = (ToolWindow)dockPanel.ActiveDocument.DockHandler.Form; + + saveToolStripButton.Enabled = Wnd.IsCmdEnabled(ToolWindow.Commands.Save); + saveToolStripMenuItem.Enabled = Wnd.IsCmdEnabled(ToolWindow.Commands.Save); + saveAsToolStripMenuItem.Enabled = Wnd.IsCmdEnabled(ToolWindow.Commands.SaveAs); + printToolStripButton.Enabled = Wnd.IsCmdEnabled(ToolWindow.Commands.Print); + printToolStripMenuItem.Enabled = Wnd.IsCmdEnabled(ToolWindow.Commands.Print); + } } }

15 years, 7 months

[cwittich] 41181: -fix save toolbar button -handle save for console window

by cwittich＠svn.reactos.org

Author: cwittich Date: Thu May 28 19:29:35 2009 New Revision: 41181 URL: http://svn.reactos.org/svn/reactos?rev=41181&view=rev Log: -fix save toolbar button -handle save for console window Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.cs trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Dockable%2… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.cs [iso-8859-1] Thu May 28 19:29:35 2009 @@ -119,10 +119,16 @@ { switch (Cmd) { + case Commands.Save: case Commands.SaveAs: return true; } return false; + } + + public override void Save(string FileName) + { + SaveAs(FileName); } public override void SaveAs(string FileName) 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] Thu May 28 19:29:35 2009 @@ -446,6 +446,7 @@ this.saveToolStripButton.Name = "saveToolStripButton"; this.saveToolStripButton.Size = new System.Drawing.Size(23, 22); this.saveToolStripButton.Text = "Save"; + this.saveToolStripButton.Click += new System.EventHandler(this.saveToolStripMenuItem_Click); // // toolStripSeparator1 //

15 years, 7 months

[cwittich] 41180: try to fix null ref exception on startup

by cwittich＠svn.reactos.org

Author: cwittich Date: Thu May 28 19:05:40 2009 New Revision: 41180 URL: http://svn.reactos.org/svn/reactos?rev=41180&view=rev Log: try to fix null ref exception on startup Modified: trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs trunk/tools/reactosdbg/RosDBG/MainWindow.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] Thu May 28 19:05:40 2009 @@ -214,14 +214,14 @@ // connectToolStripMenuItem // this.connectToolStripMenuItem.Name = "connectToolStripMenuItem"; - this.connectToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.connectToolStripMenuItem.Size = new System.Drawing.Size(123, 22); this.connectToolStripMenuItem.Text = "C&onnect"; this.connectToolStripMenuItem.Click += new System.EventHandler(this.connectToolStripMenuItem_Click); // // toolStripMenuItem3 // this.toolStripMenuItem3.Name = "toolStripMenuItem3"; - this.toolStripMenuItem3.Size = new System.Drawing.Size(149, 6); + this.toolStripMenuItem3.Size = new System.Drawing.Size(120, 6); // // continueToolStripMenuItem // @@ -229,7 +229,7 @@ this.continueToolStripMenuItem.Image = global::RosDBG.Properties.Resources.Run; this.continueToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Fuchsia; this.continueToolStripMenuItem.Name = "continueToolStripMenuItem"; - this.continueToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.continueToolStripMenuItem.Size = new System.Drawing.Size(123, 22); this.continueToolStripMenuItem.Text = "&Continue"; this.continueToolStripMenuItem.Click += new System.EventHandler(this.continueToolStripMenuItem_Click); // @@ -237,7 +237,7 @@ // this.nextToolStripMenuItem.Enabled = false; this.nextToolStripMenuItem.Name = "nextToolStripMenuItem"; - this.nextToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.nextToolStripMenuItem.Size = new System.Drawing.Size(123, 22); this.nextToolStripMenuItem.Text = "&Next"; this.nextToolStripMenuItem.Click += new System.EventHandler(this.nextToolStripMenuItem_Click); // @@ -245,14 +245,14 @@ // this.stepToolStripMenuItem.Enabled = false; this.stepToolStripMenuItem.Name = "stepToolStripMenuItem"; - this.stepToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.stepToolStripMenuItem.Size = new System.Drawing.Size(123, 22); this.stepToolStripMenuItem.Text = "&Step"; this.stepToolStripMenuItem.Click += new System.EventHandler(this.stepToolStripMenuItem_Click); // // toolStripMenuItem1 // this.toolStripMenuItem1.Name = "toolStripMenuItem1"; - this.toolStripMenuItem1.Size = new System.Drawing.Size(149, 6); + this.toolStripMenuItem1.Size = new System.Drawing.Size(120, 6); this.toolStripMenuItem1.Visible = false; // // breakToolStripMenuItem @@ -261,7 +261,7 @@ this.breakToolStripMenuItem.Image = global::RosDBG.Properties.Resources.Pause; this.breakToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Fuchsia; this.breakToolStripMenuItem.Name = "breakToolStripMenuItem"; - this.breakToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.breakToolStripMenuItem.Size = new System.Drawing.Size(123, 22); this.breakToolStripMenuItem.Text = "&Break"; this.breakToolStripMenuItem.Visible = false; this.breakToolStripMenuItem.Click += new System.EventHandler(this.breakToolStripMenuItem_Click); @@ -574,7 +574,7 @@ dockPanelSkin1.DockPaneStripSkin = dockPaneStripSkin1; this.dockPanel.Skin = dockPanelSkin1; this.dockPanel.TabIndex = 4; - this.dockPanel.ActiveContentChanged += new System.EventHandler(this.dockPanel_ActiveContentChanged); + this.dockPanel.ActiveDocumentChanged += new System.EventHandler(this.dockPanel_ActiveDocumentChanged); // // MainWindow // 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] Thu May 28 19:05:40 2009 @@ -339,7 +339,13 @@ ((ToolWindow)dockPanel.ActiveDocument.DockHandler.Form).GetDocumentName()); } - private void dockPanel_ActiveContentChanged(object sender, EventArgs e) + private void aboutToolStripMenuItem_Click(object sender, EventArgs e) + { + AboutDlg about = new AboutDlg(); + about.ShowDialog(this); + } + + private void dockPanel_ActiveDocumentChanged(object sender, EventArgs e) { ToolWindow Wnd = (ToolWindow)dockPanel.ActiveDocument.DockHandler.Form; @@ -350,12 +356,6 @@ printToolStripMenuItem.Enabled = Wnd.IsCmdEnabled(ToolWindow.Commands.Print); } - private void aboutToolStripMenuItem_Click(object sender, EventArgs e) - { - AboutDlg about = new AboutDlg(); - about.ShowDialog(this); - } - } }

15 years, 7 months

[cwittich] 41179: add missing files

by cwittich＠svn.reactos.org

Author: cwittich Date: Thu May 28 17:03:35 2009 New Revision: 41179 URL: http://svn.reactos.org/svn/reactos?rev=41179&view=rev Log: add missing files Added: trunk/tools/reactosdbg/RosDBG/Dockable Objects/ToolWindow.Designer.cs (with props) trunk/tools/reactosdbg/RosDBG/Dockable Objects/ToolWindow.cs (with props) Added: trunk/tools/reactosdbg/RosDBG/Dockable Objects/ToolWindow.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Dockable%2… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Dockable Objects/ToolWindow.Designer.cs (added) +++ trunk/tools/reactosdbg/RosDBG/Dockable Objects/ToolWindow.Designer.cs [iso-8859-1] Thu May 28 17:03:35 2009 @@ -1,0 +1,38 @@ +ï»¿namespace RosDBG +{ + partial class ToolWindow + { + /// <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.components = new System.ComponentModel.Container(); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Text = "ToolWindow"; + } + + #endregion + } +} Propchange: trunk/tools/reactosdbg/RosDBG/Dockable Objects/ToolWindow.Designer.cs ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/tools/reactosdbg/RosDBG/Dockable Objects/ToolWindow.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Dockable%2… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Dockable Objects/ToolWindow.cs (added) +++ trunk/tools/reactosdbg/RosDBG/Dockable Objects/ToolWindow.cs [iso-8859-1] Thu May 28 17:03:35 2009 @@ -1,0 +1,44 @@ +ï»¿using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; +using WeifenLuo.WinFormsUI.Docking; + +namespace RosDBG +{ + public partial class ToolWindow : DockContent + { + + public enum Commands {Copy, Cut, Paste, Save, SaveAs, Print}; + + public ToolWindow() + { + InitializeComponent(); + } + + public virtual void SaveAs(string FileName) + { + MessageBox.Show("Not implemented!"); + } + + public virtual void Save(string FileName) + { + SaveAs(FileName); + } + + public virtual string GetDocumentName() + { + return ""; + } + + public virtual bool IsCmdEnabled(Commands Cmd) + { + return false; + } + + } +} Propchange: trunk/tools/reactosdbg/RosDBG/Dockable Objects/ToolWindow.cs ------------------------------------------------------------------------------ svn:eol-style = native

15 years, 7 months

[cwittich] 41178: -check if reactos sources and .nostrip files can be found on directory selection and warn otherwise -add missing resource files -add an icon for continue

by cwittich＠svn.reactos.org

Author: cwittich Date: Thu May 28 16:56:29 2009 New Revision: 41178 URL: http://svn.reactos.org/svn/reactos?rev=41178&view=rev Log: -check if reactos sources and .nostrip files can be found on directory selection and warn otherwise -add missing resource files -add an icon for continue Added: trunk/tools/reactosdbg/RosDBG/Resources/ (with props) trunk/tools/reactosdbg/RosDBG/Resources/Pause.bmp (with props) trunk/tools/reactosdbg/RosDBG/Resources/Run.bmp (with props) trunk/tools/reactosdbg/RosDBG/Resources/copyToolStripMenuItem.Image.png (with props) trunk/tools/reactosdbg/RosDBG/Resources/emblem-system.ico (with props) trunk/tools/reactosdbg/RosDBG/Resources/internet-web-browser.ico (with props) trunk/tools/reactosdbg/RosDBG/Resources/utilities-terminal.ico (with props) Removed: trunk/tools/reactosdbg/RosDBG/res/ Modified: trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs trunk/tools/reactosdbg/RosDBG/MainWindow.cs trunk/tools/reactosdbg/RosDBG/Properties/Resources.Designer.cs trunk/tools/reactosdbg/RosDBG/Properties/Resources.resx trunk/tools/reactosdbg/RosDBG/RosDBG.csproj trunk/tools/reactosdbg/RosDBG/Settings.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] Thu May 28 16:56:29 2009 @@ -29,6 +29,7 @@ private void InitializeComponent() { 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(); @@ -44,12 +45,14 @@ 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(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainWindow)); this.menuStrip = new System.Windows.Forms.MenuStrip(); this.fileMenu = new System.Windows.Forms.ToolStripMenuItem(); + this.openToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); + this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.saveAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); + this.printToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.printSetupToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator(); this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -65,6 +68,8 @@ this.consoleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.memoryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.registerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.modulesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.procThreadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.localsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.backtraceToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.webbrowserToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -78,21 +83,19 @@ this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator(); this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStrip = new System.Windows.Forms.ToolStrip(); + this.openToolStripButton = new System.Windows.Forms.ToolStripButton(); + this.saveToolStripButton = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.printToolStripButton = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.helpToolStripButton = new System.Windows.Forms.ToolStripButton(); + this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator(); + 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.modulesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.procThreadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.openToolStripButton = new System.Windows.Forms.ToolStripButton(); - this.saveToolStripButton = new System.Windows.Forms.ToolStripButton(); - this.printToolStripButton = new System.Windows.Forms.ToolStripButton(); - this.helpToolStripButton = new System.Windows.Forms.ToolStripButton(); - this.openToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.printToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.menuStrip.SuspendLayout(); this.toolStrip.SuspendLayout(); this.statusStrip.SuspendLayout(); @@ -129,10 +132,30 @@ this.fileMenu.Size = new System.Drawing.Size(37, 20); this.fileMenu.Text = "&File"; // + // openToolStripMenuItem + // + this.openToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("openToolStripMenuItem.Image"))); + 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.Text = "&Open"; + this.openToolStripMenuItem.Click += new System.EventHandler(this.OpenFile); + // // toolStripSeparator3 // this.toolStripSeparator3.Name = "toolStripSeparator3"; this.toolStripSeparator3.Size = new System.Drawing.Size(145, 6); + // + // saveToolStripMenuItem + // + this.saveToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("saveToolStripMenuItem.Image"))); + 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.Text = "&Save"; + this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click); // // saveAsToolStripMenuItem // @@ -145,6 +168,15 @@ // this.toolStripSeparator4.Name = "toolStripSeparator4"; this.toolStripSeparator4.Size = new System.Drawing.Size(145, 6); + // + // printToolStripMenuItem + // + this.printToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("printToolStripMenuItem.Image"))); + 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.Text = "&Print"; // // printSetupToolStripMenuItem // @@ -182,20 +214,22 @@ // connectToolStripMenuItem // this.connectToolStripMenuItem.Name = "connectToolStripMenuItem"; - this.connectToolStripMenuItem.Size = new System.Drawing.Size(123, 22); + this.connectToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.connectToolStripMenuItem.Text = "C&onnect"; this.connectToolStripMenuItem.Click += new System.EventHandler(this.connectToolStripMenuItem_Click); // // toolStripMenuItem3 // this.toolStripMenuItem3.Name = "toolStripMenuItem3"; - this.toolStripMenuItem3.Size = new System.Drawing.Size(120, 6); + this.toolStripMenuItem3.Size = new System.Drawing.Size(149, 6); // // continueToolStripMenuItem // this.continueToolStripMenuItem.Enabled = false; + this.continueToolStripMenuItem.Image = global::RosDBG.Properties.Resources.Run; + this.continueToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Fuchsia; this.continueToolStripMenuItem.Name = "continueToolStripMenuItem"; - this.continueToolStripMenuItem.Size = new System.Drawing.Size(123, 22); + this.continueToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.continueToolStripMenuItem.Text = "&Continue"; this.continueToolStripMenuItem.Click += new System.EventHandler(this.continueToolStripMenuItem_Click); // @@ -203,7 +237,7 @@ // this.nextToolStripMenuItem.Enabled = false; this.nextToolStripMenuItem.Name = "nextToolStripMenuItem"; - this.nextToolStripMenuItem.Size = new System.Drawing.Size(123, 22); + this.nextToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.nextToolStripMenuItem.Text = "&Next"; this.nextToolStripMenuItem.Click += new System.EventHandler(this.nextToolStripMenuItem_Click); // @@ -211,21 +245,25 @@ // this.stepToolStripMenuItem.Enabled = false; this.stepToolStripMenuItem.Name = "stepToolStripMenuItem"; - this.stepToolStripMenuItem.Size = new System.Drawing.Size(123, 22); + this.stepToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.stepToolStripMenuItem.Text = "&Step"; this.stepToolStripMenuItem.Click += new System.EventHandler(this.stepToolStripMenuItem_Click); // // toolStripMenuItem1 // this.toolStripMenuItem1.Name = "toolStripMenuItem1"; - this.toolStripMenuItem1.Size = new System.Drawing.Size(120, 6); + this.toolStripMenuItem1.Size = new System.Drawing.Size(149, 6); + this.toolStripMenuItem1.Visible = false; // // breakToolStripMenuItem // this.breakToolStripMenuItem.Enabled = false; + this.breakToolStripMenuItem.Image = global::RosDBG.Properties.Resources.Pause; + this.breakToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Fuchsia; this.breakToolStripMenuItem.Name = "breakToolStripMenuItem"; - this.breakToolStripMenuItem.Size = new System.Drawing.Size(123, 22); + this.breakToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.breakToolStripMenuItem.Text = "&Break"; + this.breakToolStripMenuItem.Visible = false; this.breakToolStripMenuItem.Click += new System.EventHandler(this.breakToolStripMenuItem_Click); // // viewMenu @@ -267,6 +305,20 @@ this.registerToolStripMenuItem.Text = "&Register"; this.registerToolStripMenuItem.Click += new System.EventHandler(this.registerToolStripMenuItem_Click); // + // modulesToolStripMenuItem + // + this.modulesToolStripMenuItem.Name = "modulesToolStripMenuItem"; + this.modulesToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.modulesToolStripMenuItem.Text = "M&odules"; + this.modulesToolStripMenuItem.Click += new System.EventHandler(this.modulesToolStripMenuItem_Click); + // + // procThreadToolStripMenuItem + // + this.procThreadToolStripMenuItem.Name = "procThreadToolStripMenuItem"; + this.procThreadToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.procThreadToolStripMenuItem.Text = "&Processes / Threads"; + this.procThreadToolStripMenuItem.Click += new System.EventHandler(this.procThreadToolStripMenuItem_Click); + // // localsToolStripMenuItem // this.localsToolStripMenuItem.Name = "localsToolStripMenuItem"; @@ -366,22 +418,89 @@ this.toolStripSeparator1, this.printToolStripButton, this.toolStripSeparator2, - this.helpToolStripButton}); + this.helpToolStripButton, + this.toolStripSeparator6, + this.continueToolStripButton, + this.breakToolStripButton}); this.toolStrip.Location = new System.Drawing.Point(0, 24); this.toolStrip.Name = "toolStrip"; this.toolStrip.Size = new System.Drawing.Size(784, 25); this.toolStrip.TabIndex = 1; this.toolStrip.Text = "ToolStrip"; // + // openToolStripButton + // + this.openToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.openToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("openToolStripButton.Image"))); + this.openToolStripButton.ImageTransparentColor = System.Drawing.Color.Black; + this.openToolStripButton.Name = "openToolStripButton"; + this.openToolStripButton.Size = new System.Drawing.Size(23, 22); + this.openToolStripButton.Text = "Open"; + this.openToolStripButton.Click += new System.EventHandler(this.OpenFile); + // + // saveToolStripButton + // + this.saveToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.saveToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("saveToolStripButton.Image"))); + this.saveToolStripButton.ImageTransparentColor = System.Drawing.Color.Black; + this.saveToolStripButton.Name = "saveToolStripButton"; + this.saveToolStripButton.Size = new System.Drawing.Size(23, 22); + this.saveToolStripButton.Text = "Save"; + // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; this.toolStripSeparator1.Size = new System.Drawing.Size(6, 25); // + // printToolStripButton + // + this.printToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.printToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("printToolStripButton.Image"))); + this.printToolStripButton.ImageTransparentColor = System.Drawing.Color.Black; + this.printToolStripButton.Name = "printToolStripButton"; + this.printToolStripButton.Size = new System.Drawing.Size(23, 22); + this.printToolStripButton.Text = "Print"; + // // toolStripSeparator2 // this.toolStripSeparator2.Name = "toolStripSeparator2"; this.toolStripSeparator2.Size = new System.Drawing.Size(6, 25); + // + // helpToolStripButton + // + this.helpToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.helpToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("helpToolStripButton.Image"))); + this.helpToolStripButton.ImageTransparentColor = System.Drawing.Color.Black; + this.helpToolStripButton.Name = "helpToolStripButton"; + this.helpToolStripButton.Size = new System.Drawing.Size(23, 22); + this.helpToolStripButton.Text = "Help"; + this.helpToolStripButton.Click += new System.EventHandler(this.contentsToolStripMenuItem_Click); + // + // toolStripSeparator6 + // + this.toolStripSeparator6.Name = "toolStripSeparator6"; + this.toolStripSeparator6.Size = new System.Drawing.Size(6, 25); + // + // continueToolStripButton + // + this.continueToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.continueToolStripButton.Enabled = false; + this.continueToolStripButton.Image = global::RosDBG.Properties.Resources.Run; + this.continueToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.continueToolStripButton.Name = "continueToolStripButton"; + this.continueToolStripButton.Size = new System.Drawing.Size(23, 22); + this.continueToolStripButton.Text = "Continue"; + // + // breakToolStripButton + // + this.breakToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.breakToolStripButton.Enabled = false; + this.breakToolStripButton.Image = global::RosDBG.Properties.Resources.Pause; + this.breakToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.breakToolStripButton.Name = "breakToolStripButton"; + this.breakToolStripButton.Size = new System.Drawing.Size(23, 22); + this.breakToolStripButton.Text = "Break"; + this.breakToolStripButton.Visible = false; // // statusStrip // @@ -457,87 +576,6 @@ this.dockPanel.TabIndex = 4; this.dockPanel.ActiveContentChanged += new System.EventHandler(this.dockPanel_ActiveContentChanged); // - // modulesToolStripMenuItem - // - this.modulesToolStripMenuItem.Name = "modulesToolStripMenuItem"; - this.modulesToolStripMenuItem.Size = new System.Drawing.Size(178, 22); - this.modulesToolStripMenuItem.Text = "M&odules"; - this.modulesToolStripMenuItem.Click += new System.EventHandler(this.modulesToolStripMenuItem_Click); - // - // procThreadToolStripMenuItem - // - this.procThreadToolStripMenuItem.Name = "procThreadToolStripMenuItem"; - this.procThreadToolStripMenuItem.Size = new System.Drawing.Size(178, 22); - this.procThreadToolStripMenuItem.Text = "&Processes / Threads"; - this.procThreadToolStripMenuItem.Click += new System.EventHandler(this.procThreadToolStripMenuItem_Click); - // - // openToolStripButton - // - this.openToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.openToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("openToolStripButton.Image"))); - this.openToolStripButton.ImageTransparentColor = System.Drawing.Color.Black; - this.openToolStripButton.Name = "openToolStripButton"; - this.openToolStripButton.Size = new System.Drawing.Size(23, 22); - this.openToolStripButton.Text = "Ãffnen"; - this.openToolStripButton.Click += new System.EventHandler(this.OpenFile); - // - // saveToolStripButton - // - this.saveToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.saveToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("saveToolStripButton.Image"))); - this.saveToolStripButton.ImageTransparentColor = System.Drawing.Color.Black; - this.saveToolStripButton.Name = "saveToolStripButton"; - this.saveToolStripButton.Size = new System.Drawing.Size(23, 22); - this.saveToolStripButton.Text = "Speichern"; - // - // printToolStripButton - // - this.printToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.printToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("printToolStripButton.Image"))); - this.printToolStripButton.ImageTransparentColor = System.Drawing.Color.Black; - this.printToolStripButton.Name = "printToolStripButton"; - this.printToolStripButton.Size = new System.Drawing.Size(23, 22); - this.printToolStripButton.Text = "Drucken"; - // - // helpToolStripButton - // - this.helpToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.helpToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("helpToolStripButton.Image"))); - this.helpToolStripButton.ImageTransparentColor = System.Drawing.Color.Black; - this.helpToolStripButton.Name = "helpToolStripButton"; - this.helpToolStripButton.Size = new System.Drawing.Size(23, 22); - this.helpToolStripButton.Text = "Hilfe"; - this.helpToolStripButton.Click += new System.EventHandler(this.contentsToolStripMenuItem_Click); - // - // openToolStripMenuItem - // - this.openToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("openToolStripMenuItem.Image"))); - 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.Text = "&Open"; - this.openToolStripMenuItem.Click += new System.EventHandler(this.OpenFile); - // - // saveToolStripMenuItem - // - this.saveToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("saveToolStripMenuItem.Image"))); - 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.Text = "&Save"; - this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click); - // - // printToolStripMenuItem - // - this.printToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("printToolStripMenuItem.Image"))); - 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.Text = "&Print"; - // // MainWindow // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -614,6 +652,9 @@ private System.Windows.Forms.ToolStripMenuItem backtraceToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem modulesToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem procThreadToolStripMenuItem; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator6; + private System.Windows.Forms.ToolStripButton continueToolStripButton; + private System.Windows.Forms.ToolStripButton breakToolStripButton; } } 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] Thu May 28 16:56:29 2009 @@ -164,13 +164,17 @@ nextToolStripMenuItem.Enabled = false; stepToolStripMenuItem.Enabled = false; continueToolStripMenuItem.Enabled = false; + continueToolStripButton.Enabled = false; + breakToolStripButton.Enabled = false; } else { breakToolStripMenuItem.Enabled = mRunning; + breakToolStripButton.Enabled = mRunning; nextToolStripMenuItem.Enabled = !mRunning; stepToolStripMenuItem.Enabled = !mRunning; continueToolStripMenuItem.Enabled = !mRunning; + continueToolStripButton.Enabled = !mRunning; } } Modified: trunk/tools/reactosdbg/RosDBG/Properties/Resources.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Properties… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Properties/Resources.Designer.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Properties/Resources.Designer.cs [iso-8859-1] Thu May 28 16:56:29 2009 @@ -66,5 +66,19 @@ return ((System.Drawing.Bitmap)(obj)); } } + + internal static System.Drawing.Bitmap Pause { + get { + object obj = ResourceManager.GetObject("Pause", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + internal static System.Drawing.Bitmap Run { + get { + object obj = ResourceManager.GetObject("Run", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } } } Modified: trunk/tools/reactosdbg/RosDBG/Properties/Resources.resx URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Properties… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Properties/Resources.resx [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Properties/Resources.resx [iso-8859-1] Thu May 28 16:56:29 2009 @@ -118,7 +118,13 @@ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> + <data name="Run" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\Run.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> <data name="copyToolStripMenuItem.Image" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\res\copyToolStripMenuItem.Image.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <value>..\Resources\copyToolStripMenuItem.Image.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="Pause" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\Pause.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> </root> Propchange: trunk/tools/reactosdbg/RosDBG/Resources/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Thu May 28 16:56:29 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/tools/reactosdbg/RosDBG/Resources/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/tools/reactosdbg/RosDBG/Resources/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Added: trunk/tools/reactosdbg/RosDBG/Resources/Pause.bmp URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Resources/… ============================================================================== Binary file - no diff available. Propchange: trunk/tools/reactosdbg/RosDBG/Resources/Pause.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/tools/reactosdbg/RosDBG/Resources/Run.bmp URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Resources/… ============================================================================== Binary file - no diff available. Propchange: trunk/tools/reactosdbg/RosDBG/Resources/Run.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/tools/reactosdbg/RosDBG/Resources/copyToolStripMenuItem.Image.png URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Resources/… ============================================================================== Binary file - no diff available. Propchange: trunk/tools/reactosdbg/RosDBG/Resources/copyToolStripMenuItem.Image.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/tools/reactosdbg/RosDBG/Resources/emblem-system.ico URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Resources/… ============================================================================== Binary file - no diff available. Propchange: trunk/tools/reactosdbg/RosDBG/Resources/emblem-system.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/tools/reactosdbg/RosDBG/Resources/internet-web-browser.ico URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Resources/… ============================================================================== Binary file - no diff available. Propchange: trunk/tools/reactosdbg/RosDBG/Resources/internet-web-browser.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/tools/reactosdbg/RosDBG/Resources/utilities-terminal.ico URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Resources/… ============================================================================== Binary file - no diff available. Propchange: trunk/tools/reactosdbg/RosDBG/Resources/utilities-terminal.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream 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] Thu May 28 16:56:29 2009 @@ -294,10 +294,12 @@ </ItemGroup> <ItemGroup> <Content Include="app-rosdbg.ico" /> - <None Include="res\copyToolStripMenuItem.Image.png" /> - <Content Include="res\emblem-system.ico" /> - <Content Include="res\internet-web-browser.ico" /> - <Content Include="res\utilities-terminal.ico" /> + <None Include="Resources\copyToolStripMenuItem.Image.png" /> + <None Include="Resources\Run.bmp" /> + <None Include="Resources\Pause.bmp" /> + <Content Include="Resources\emblem-system.ico" /> + <Content Include="Resources\internet-web-browser.ico" /> + <Content Include="Resources\utilities-terminal.ico" /> </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 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] Thu May 28 16:56:29 2009 @@ -8,6 +8,7 @@ using System.Configuration; using System.Windows.Forms; using System.Drawing.Design; +using System.IO; using System.IO.Ports; namespace RosDBG @@ -70,7 +71,12 @@ public string SourceDirectory { get { return this["SourceDirectory"].ToString(); } - set { this["SourceDirectory"] = value; } + set + { + if (!File.Exists(value + "\\ReactOS-generic.rbuild")) + MessageBox.Show("Can not find ReactOS sources in this directory!", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Exclamation); + this["SourceDirectory"] = value; + } } [CategoryAttribute("Directories"), DescriptionAttribute("Directory settings")] @@ -78,7 +84,12 @@ public string OutputDirectory { get { return this["OutputDirectory"].ToString(); } - set { this["OutputDirectory"] = value; } + set + { + if (!File.Exists(value + "\\ntoskrnl\\ntoskrnl.nostrip.exe")) + MessageBox.Show("Can not find .nostrip files!\nThe Debugger will not work properly without them.\n\nPlease enable building of .nostrip files in RosBE options." , "Warning", MessageBoxButtons.OK, MessageBoxIcon.Exclamation); + this["OutputDirectory"] = value; + } } [CategoryAttribute("Connection"), DescriptionAttribute("Connection settings")]

15 years, 7 months

[fireball] 41177: - Delete entries for removed modules (os2, posix, rosky and vms).

by fireball＠svn.reactos.org

Author: fireball Date: Thu May 28 16:53:29 2009 New Revision: 41177 URL: http://svn.reactos.org/svn/reactos?rev=41177&view=rev Log: - Delete entries for removed modules (os2, posix, rosky and vms). Modified: trunk/reactos/modules/directory.rbuild Modified: trunk/reactos/modules/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/modules/directory.rbuild?r… ============================================================================== --- trunk/reactos/modules/directory.rbuild [iso-8859-1] (original) +++ trunk/reactos/modules/directory.rbuild [iso-8859-1] Thu May 28 16:53:29 2009 @@ -1,20 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> - <directory name="os2"> - <xi:include href="os2/directory.rbuild"> - <xi:fallback> - <xi:include href="empty.rbuild" /> - </xi:fallback> - </xi:include> - </directory> - <directory name="posix"> - <xi:include href="posix/directory.rbuild"> - <xi:fallback> - <xi:include href="empty.rbuild" /> - </xi:fallback> - </xi:include> - </directory> <directory name="rosapps"> <xi:include href="rosapps/directory.rbuild"> <xi:fallback> @@ -22,22 +8,8 @@ </xi:fallback> </xi:include> </directory> - <directory name="rosky"> - <xi:include href="rosky/directory.rbuild"> - <xi:fallback> - <xi:include href="empty.rbuild" /> - </xi:fallback> - </xi:include> - </directory> <directory name="rostests"> <xi:include href="rostests/directory.rbuild"> - <xi:fallback> - <xi:include href="empty.rbuild" /> - </xi:fallback> - </xi:include> - </directory> - <directory name="vms"> - <xi:include href="vms/directory.rbuild"> <xi:fallback> <xi:include href="empty.rbuild" /> </xi:fallback>

15 years, 7 months

← Newer
1
2
3
4
5
6
7
8
9
...
51
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2009