Ros-diffs August 2009

ros-diffs@reactos.org

21 participants
654 discussions

[dchapyshev] 42946: - Fix problem with uTorrent deinstallation - Closing of keys at list updating

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Wed Aug 26 21:03:32 2009 New Revision: 42946 URL: http://svn.reactos.org/svn/reactos?rev=42946&view=rev Log: - Fix problem with uTorrent deinstallation - Closing of keys at list updating Modified: trunk/reactos/base/applications/rapps/installed.c trunk/reactos/base/applications/rapps/rapps.h trunk/reactos/base/applications/rapps/winmain.c Modified: trunk/reactos/base/applications/rapps/installed.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/in… ============================================================================== --- trunk/reactos/base/applications/rapps/installed.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/installed.c [iso-8859-1] Wed Aug 26 21:03:32 2009 @@ -31,7 +31,7 @@ BOOL -IsInstalledApplication(LPWSTR lpRegName) +IsInstalledApplication(LPWSTR lpRegName, BOOL IsUserKey) { DWORD dwSize = MAX_PATH, dwType; WCHAR szName[MAX_PATH]; @@ -39,7 +39,7 @@ HKEY hKey, hSubKey; INT ItemIndex = 0; - if (RegOpenKeyW(HKEY_LOCAL_MACHINE, + if (RegOpenKeyW(IsUserKey ? HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall", &hKey) != ERROR_SUCCESS) { @@ -247,7 +247,6 @@ ItemIndex++; } - RegCloseKey(hSubKey); RegCloseKey(hKey); return TRUE; Modified: trunk/reactos/base/applications/rapps/rapps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps.h [iso-8859-1] Wed Aug 26 21:03:32 2009 @@ -80,7 +80,7 @@ BOOL GetApplicationString(HKEY hKey, LPWSTR lpKeyName, LPWSTR lpString); BOOL ShowInstalledAppInfo(INT Index); BOOL UninstallApplication(INT Index, BOOL bModify); -BOOL IsInstalledApplication(LPWSTR lpRegName); +BOOL IsInstalledApplication(LPWSTR lpRegName, BOOL IsUserKey); /* winmain.c */ extern HWND hMainWnd; Modified: trunk/reactos/base/applications/rapps/winmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/wi… ============================================================================== --- trunk/reactos/base/applications/rapps/winmain.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/winmain.c [iso-8859-1] Wed Aug 26 21:03:32 2009 @@ -15,6 +15,21 @@ INT SelectedEnumType = ENUM_ALL_COMPONENTS; +VOID +FreeInstalledAppList(VOID) +{ + INT Count = ListView_GetItemCount(hListView) - 1; + HKEY hKey; + + while (Count >= 0) + { + hKey = ListViewGetlParam(Count); + if (hKey) + RegCloseKey(hKey); + Count--; + } +} + BOOL CALLBACK EnumInstalledAppProc(INT ItemIndex, LPWSTR lpName, LPWSTR lpKeyName, LPARAM lParam) @@ -56,7 +71,8 @@ PAPPLICATION_INFO ItemInfo; INT Index; - if (!IsInstalledApplication(Info.szRegName)) + if (!IsInstalledApplication(Info.szRegName, FALSE) && + !IsInstalledApplication(Info.szRegName, TRUE)) { ItemInfo = HeapAlloc(GetProcessHeap(), 0, sizeof(APPLICATION_INFO)); if (!ItemInfo) return FALSE; @@ -98,6 +114,11 @@ if (EnumType == -1) EnumType = SelectedEnumType; + if (IS_INSTALLED_ENUM(SelectedEnumType)) + FreeInstalledAppList(); + else if (IS_AVAILABLE_ENUM(SelectedEnumType)) + FreeAvailableAppList(); + if (IS_INSTALLED_ENUM(EnumType)) { /* Enum installed applications and updates */ @@ -106,9 +127,6 @@ } else if (IS_AVAILABLE_ENUM(EnumType)) { - if (IS_AVAILABLE_ENUM(SelectedEnumType)) - FreeAvailableAppList(); - /* Enum availabled applications */ EnumAvailableApplications(EnumType, EnumAvailableAppProc); } @@ -608,6 +626,8 @@ { if (IS_AVAILABLE_ENUM(SelectedEnumType)) FreeAvailableAppList(); + if (IS_INSTALLED_ENUM(SelectedEnumType)) + FreeInstalledAppList(); if (hImageListView) ImageList_Destroy(hImageListView); if (hImageTreeView) ImageList_Destroy(hImageTreeView); PostQuitMessage(0);

15 years

[gschneider] 42945: - Remove built in commands from the input control like other commands after execution - Append control character to commands in KDBG, not in the input control - Re-add previously removed code to allow typing commands while the log is highlighted; modify to allow input all the time

by gschneider＠svn.reactos.org

Author: gschneider Date: Wed Aug 26 20:22:34 2009 New Revision: 42945 URL: http://svn.reactos.org/svn/reactos?rev=42945&view=rev Log: - Remove built in commands from the input control like other commands after execution - Append control character to commands in KDBG, not in the input control - Re-add previously removed code to allow typing commands while the log is highlighted; modify to allow input all the time Modified: trunk/tools/reactosdbg/DebugProtocol/KDBG.cs trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.Designer.cs trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.cs trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.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 Aug 26 20:22:34 2009 @@ -427,7 +427,7 @@ /* Forward user input from RawTraffic if connected to kdbg */ if (!mRunning) { - mConnection.Write(wr); + mConnection.Write(wr + "\r"); } } Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Dockable%2… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.Designer.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.Designer.cs [iso-8859-1] Wed Aug 26 20:22:34 2009 @@ -62,6 +62,7 @@ this.RawTrafficText.Size = new System.Drawing.Size(425, 268); this.RawTrafficText.TabIndex = 0; this.RawTrafficText.WordWrap = false; + this.RawTrafficText.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.RawTrafficText_KeyPress); this.RawTrafficText.MouseUp += new System.Windows.Forms.MouseEventHandler(this.RawTrafficText_MouseUp); // // menuStrip1 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] Wed Aug 26 20:22:34 2009 @@ -52,17 +52,17 @@ private void ParseBuiltinCommand(string command) { + AddCommandToList(command); if (command == ".cls") { - AddCommandToList(command); RawTrafficText.Text = string.Empty; } + RawTrafficTextBox.Text = string.Empty; } private void ParseGdbCommand(string command) { AddCommandToList(command); - RawTrafficTextBox.Text += '\r'; //FIXME: remove this SendCommandToDebugger(); RawTrafficTextBox.Text = string.Empty; } @@ -141,7 +141,7 @@ { String cmd = RawTrafficTextBox.Text; RawTrafficText.AppendText(kdbPrompt); - if (cmd == "cont\r") + if (cmd == "cont") { mConnection.Running = true; } @@ -248,6 +248,26 @@ } + private void RawTrafficText_KeyPress(object sender, KeyPressEventArgs e) + { + switch ((int)e.KeyChar) + { + case 8: /* Backspace */ + if (RawTrafficTextBox.Text.Length > 0) + RawTrafficTextBox.Text = RawTrafficTextBox.Text.Substring(0, RawTrafficTextBox.Text.Length - 1); + break; + case 13: /* Return */ + if (RawTrafficTextBox.Text.Length > 0) + { + ParseCommand(RawTrafficTextBox.Text); + } + break; + default: + RawTrafficTextBox.Text += e.KeyChar; + break; + } + } + private void RawTrafficText_MouseUp(object sender, MouseEventArgs e) { copyToolStripMenuItem.Enabled = (RawTrafficText.SelectionLength > 0); Modified: trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Properties… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs [iso-8859-1] Wed Aug 26 20:22:34 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.80")] -[assembly: AssemblyFileVersion("1.0.2.80")] +[assembly: AssemblyVersion("1.0.2.81")] +[assembly: AssemblyFileVersion("1.0.2.81")]

15 years

[dchapyshev] 42944: - Fix typo in Russian translation

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Wed Aug 26 19:46:48 2009 New Revision: 42944 URL: http://svn.reactos.org/svn/reactos?rev=42944&view=rev Log: - Fix typo in Russian translation Modified: trunk/reactos/base/applications/rapps/lang/ru-RU.rc Modified: trunk/reactos/base/applications/rapps/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/ru-RU.rc [iso-8859-1] Wed Aug 26 19:46:48 2009 @@ -157,7 +157,7 @@ IDS_MODIFY "Èçìåíèòü" IDS_APPS_COUNT "Êîëè÷åñòâî: %d" IDS_WELCOME_TITLE "Äîáðî ïîæàëîâàòü â ""Ìåíåäæåð ïðèëîæåíèé ReactOS""!\n\n" - IDS_WELCOME_TEXT "Âûáåðèòå êàòåãîðèÿ ñëåâà è ïðèëîæåíèå äëÿ óñòàíîâêè èëè óäàëåíèÿ.\nÑàéò ReactOS: " + IDS_WELCOME_TEXT "Âûáåðèòå êàòåãîðèþ ñëåâà è ïðèëîæåíèå äëÿ óñòàíîâêè èëè óäàëåíèÿ.\nÑàéò ReactOS: " IDS_WELCOME_URL "http://www.reactos.org" IDS_INSTALLED "Óñòàíîâëåííûå" IDS_AVAILABLEFORINST "Äîñòóïíî äëÿ óñòàíîâêè"

15 years

[sginsberg] 42943: - Fix a typo -- check if memory allocation failed instead of checking if a variable's stack address is NULL.

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Wed Aug 26 19:41:01 2009 New Revision: 42943 URL: http://svn.reactos.org/svn/reactos?rev=42943&view=rev Log: - Fix a typo -- check if memory allocation failed instead of checking if a variable's stack address is NULL. Modified: trunk/reactos/ntoskrnl/se/priv.c Modified: trunk/reactos/ntoskrnl/se/priv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/priv.c?rev=429… ============================================================================== --- trunk/reactos/ntoskrnl/se/priv.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/priv.c [iso-8859-1] Wed Aug 26 19:41:01 2009 @@ -237,7 +237,7 @@ *Dest = ExAllocatePool(PoolType, BufferSize); - if (&Dest == NULL) + if (*Dest == NULL) { return STATUS_INSUFFICIENT_RESOURCES; }

15 years

[sginsberg] 42942: - Make use of _SEH2_YIELD in Ex, Io, Ob, Ps and Se. - Don't call ExSystemExceptionFilter() if we know the caller is user mode. - Get rid of a couple of dependencies on the NTSTATUS being initialized with STATUS_SUCCESS -- indicate success where properly instead.

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Wed Aug 26 19:31:02 2009 New Revision: 42942 URL: http://svn.reactos.org/svn/reactos?rev=42942&view=rev Log: - Make use of _SEH2_YIELD in Ex, Io, Ob, Ps and Se. - Don't call ExSystemExceptionFilter() if we know the caller is user mode. - Get rid of a couple of dependencies on the NTSTATUS being initialized with STATUS_SUCCESS -- indicate success where properly instead. Modified: trunk/reactos/ntoskrnl/ex/atom.c trunk/reactos/ntoskrnl/ex/event.c trunk/reactos/ntoskrnl/ex/evtpair.c trunk/reactos/ntoskrnl/ex/harderr.c trunk/reactos/ntoskrnl/ex/mutant.c trunk/reactos/ntoskrnl/ex/profile.c trunk/reactos/ntoskrnl/ex/sem.c trunk/reactos/ntoskrnl/ex/sysinfo.c trunk/reactos/ntoskrnl/ex/time.c trunk/reactos/ntoskrnl/ex/timer.c trunk/reactos/ntoskrnl/ex/uuid.c trunk/reactos/ntoskrnl/io/iomgr/file.c trunk/reactos/ntoskrnl/io/iomgr/iocomp.c trunk/reactos/ntoskrnl/io/iomgr/iofunc.c trunk/reactos/ntoskrnl/io/iomgr/irp.c trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c trunk/reactos/ntoskrnl/ob/obdir.c trunk/reactos/ntoskrnl/ob/obhandle.c trunk/reactos/ntoskrnl/ob/oblife.c trunk/reactos/ntoskrnl/ob/oblink.c trunk/reactos/ntoskrnl/ob/obsecure.c trunk/reactos/ntoskrnl/ob/obwait.c trunk/reactos/ntoskrnl/ps/debug.c trunk/reactos/ntoskrnl/ps/job.c trunk/reactos/ntoskrnl/ps/process.c trunk/reactos/ntoskrnl/ps/query.c trunk/reactos/ntoskrnl/ps/security.c trunk/reactos/ntoskrnl/ps/state.c trunk/reactos/ntoskrnl/ps/thread.c trunk/reactos/ntoskrnl/ps/win32.c trunk/reactos/ntoskrnl/se/acl.c trunk/reactos/ntoskrnl/se/priv.c trunk/reactos/ntoskrnl/se/sd.c trunk/reactos/ntoskrnl/se/sid.c trunk/reactos/ntoskrnl/se/token.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/ntoskrnl/ex/atom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/atom.c?rev=429… Modified: trunk/reactos/ntoskrnl/ex/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/event.c?rev=42… Modified: trunk/reactos/ntoskrnl/ex/evtpair.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/evtpair.c?rev=… Modified: trunk/reactos/ntoskrnl/ex/harderr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/harderr.c?rev=… Modified: trunk/reactos/ntoskrnl/ex/mutant.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/mutant.c?rev=4… Modified: trunk/reactos/ntoskrnl/ex/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/profile.c?rev=… Modified: trunk/reactos/ntoskrnl/ex/sem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sem.c?rev=4294… Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… Modified: trunk/reactos/ntoskrnl/ex/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/time.c?rev=429… Modified: trunk/reactos/ntoskrnl/ex/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/timer.c?rev=42… Modified: trunk/reactos/ntoskrnl/ex/uuid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/uuid.c?rev=429… Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… Modified: trunk/reactos/ntoskrnl/io/iomgr/iocomp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iocomp.c… Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iofunc.c… Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/irp.c?re… Modified: trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/plugpla… Modified: trunk/reactos/ntoskrnl/ob/obdir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obdir.c?rev=42… Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev… Modified: trunk/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=4… Modified: trunk/reactos/ntoskrnl/ob/oblink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblink.c?rev=4… Modified: trunk/reactos/ntoskrnl/ob/obsecure.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obsecure.c?rev… Modified: trunk/reactos/ntoskrnl/ob/obwait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obwait.c?rev=4… Modified: trunk/reactos/ntoskrnl/ps/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/debug.c?rev=42… Modified: trunk/reactos/ntoskrnl/ps/job.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/job.c?rev=4294… Modified: trunk/reactos/ntoskrnl/ps/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/process.c?rev=… Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=42… Modified: trunk/reactos/ntoskrnl/ps/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/security.c?rev… Modified: trunk/reactos/ntoskrnl/ps/state.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/state.c?rev=42… Modified: trunk/reactos/ntoskrnl/ps/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/thread.c?rev=4… Modified: trunk/reactos/ntoskrnl/ps/win32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/win32.c?rev=42… Modified: trunk/reactos/ntoskrnl/se/acl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/acl.c?rev=4294… Modified: trunk/reactos/ntoskrnl/se/priv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/priv.c?rev=429… Modified: trunk/reactos/ntoskrnl/se/sd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/sd.c?rev=42942… Modified: trunk/reactos/ntoskrnl/se/sid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/sid.c?rev=4294… Modified: trunk/reactos/ntoskrnl/se/token.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/token.c?rev=42…

15 years

[gschneider] 42941: - Allow to delete the content of the rawtraffic tab from the edit menu (requested by Stefan Ludowicy) - Don't send commands to KDBG if it isn't there - Remove old code and related events

by gschneider＠svn.reactos.org

Author: gschneider Date: Wed Aug 26 19:01:26 2009 New Revision: 42941 URL: http://svn.reactos.org/svn/reactos?rev=42941&view=rev Log: - Allow to delete the content of the rawtraffic tab from the edit menu (requested by Stefan Ludowicy) - Don't send commands to KDBG if it isn't there - Remove old code and related events Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.Designer.cs trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.cs trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Dockable%2… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.Designer.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.Designer.cs [iso-8859-1] Wed Aug 26 19:01:26 2009 @@ -33,6 +33,7 @@ this.menuStrip1 = new System.Windows.Forms.MenuStrip(); this.editToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.copyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.clearToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator(); this.selectAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); @@ -61,7 +62,6 @@ this.RawTrafficText.Size = new System.Drawing.Size(425, 268); this.RawTrafficText.TabIndex = 0; this.RawTrafficText.WordWrap = false; - this.RawTrafficText.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.RawTrafficText_KeyPress); this.RawTrafficText.MouseUp += new System.Windows.Forms.MouseEventHandler(this.RawTrafficText_MouseUp); // // menuStrip1 @@ -70,7 +70,7 @@ this.editToolStripMenuItem}); this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Name = "menuStrip1"; - this.menuStrip1.Size = new System.Drawing.Size(397, 24); + this.menuStrip1.Size = new System.Drawing.Size(425, 24); this.menuStrip1.TabIndex = 4; this.menuStrip1.Text = "menuStrip1"; this.menuStrip1.Visible = false; @@ -79,12 +79,13 @@ // this.editToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.copyToolStripMenuItem, + this.clearToolStripMenuItem, this.toolStripMenuItem1, this.selectAllToolStripMenuItem}); this.editToolStripMenuItem.MergeAction = System.Windows.Forms.MergeAction.Insert; this.editToolStripMenuItem.MergeIndex = 1; this.editToolStripMenuItem.Name = "editToolStripMenuItem"; - this.editToolStripMenuItem.Size = new System.Drawing.Size(39, 20); + this.editToolStripMenuItem.Size = new System.Drawing.Size(37, 20); this.editToolStripMenuItem.Text = "&Edit"; this.editToolStripMenuItem.Click += new System.EventHandler(this.editToolStripMenuItem_Click); // @@ -93,19 +94,26 @@ this.copyToolStripMenuItem.Enabled = false; this.copyToolStripMenuItem.Image = global::RosDBG.Properties.Resources.copyToolStripMenuItem_Image; this.copyToolStripMenuItem.Name = "copyToolStripMenuItem"; - this.copyToolStripMenuItem.Size = new System.Drawing.Size(120, 22); + this.copyToolStripMenuItem.Size = new System.Drawing.Size(127, 22); this.copyToolStripMenuItem.Text = "&Copy"; this.copyToolStripMenuItem.Click += new System.EventHandler(this.copyToolStripMenuItem_Click); // + // clearToolStripMenuItem + // + this.clearToolStripMenuItem.Name = "clearToolStripMenuItem"; + this.clearToolStripMenuItem.Size = new System.Drawing.Size(127, 22); + this.clearToolStripMenuItem.Text = "C&lear"; + this.clearToolStripMenuItem.Click += new System.EventHandler(this.clearToolStripMenuItem_Click); + // // toolStripMenuItem1 // this.toolStripMenuItem1.Name = "toolStripMenuItem1"; - this.toolStripMenuItem1.Size = new System.Drawing.Size(117, 6); + this.toolStripMenuItem1.Size = new System.Drawing.Size(124, 6); // // selectAllToolStripMenuItem // this.selectAllToolStripMenuItem.Name = "selectAllToolStripMenuItem"; - this.selectAllToolStripMenuItem.Size = new System.Drawing.Size(120, 22); + this.selectAllToolStripMenuItem.Size = new System.Drawing.Size(127, 22); this.selectAllToolStripMenuItem.Text = "&Select all"; this.selectAllToolStripMenuItem.Click += new System.EventHandler(this.selectAllToolStripMenuItem_Click); // @@ -210,5 +218,6 @@ private System.Windows.Forms.SplitContainer splitContainer2; private System.Windows.Forms.TextBox RawTrafficTextBox; private System.Windows.Forms.Label label1; + private System.Windows.Forms.ToolStripMenuItem clearToolStripMenuItem; } } 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] Wed Aug 26 19:01:26 2009 @@ -137,7 +137,7 @@ private void SendCommandToDebugger() { - if (RawTrafficTextBox.Text.Length > 0 && mConnection.Debugger != null) + if (RawTrafficTextBox.Text.Length > 0 && mConnection.Debugger != null && !mConnection.Running) { String cmd = RawTrafficTextBox.Text; RawTrafficText.AppendText(kdbPrompt); @@ -248,29 +248,6 @@ } - private void RawTrafficText_KeyPress(object sender, KeyPressEventArgs e) - { - if ((mConnection.ConnectionMode != DebugConnection.Mode.ClosedMode) && (!mConnection.Running)) - { - switch ((int)e.KeyChar) - { - case 8: /* Backspace */ - if (RawTrafficTextBox.Text.Length > 0) - RawTrafficTextBox.Text = RawTrafficTextBox.Text.Substring(0, RawTrafficTextBox.Text.Length - 1); - break; - case 13: /* Return */ - if (RawTrafficTextBox.Text.ToLower().CompareTo("cont") == 0) - mConnection.Running = true; - RawTrafficTextBox.Text += e.KeyChar; - SendCommandToDebugger(); - break; - default: - RawTrafficTextBox.Text += e.KeyChar; - break; - } - } - } - private void RawTrafficText_MouseUp(object sender, MouseEventArgs e) { copyToolStripMenuItem.Enabled = (RawTrafficText.SelectionLength > 0); @@ -289,7 +266,9 @@ private void editToolStripMenuItem_Click(object sender, EventArgs e) { - selectAllToolStripMenuItem.Enabled = (RawTrafficText.Text.Length != 0); + bool hasText = RawTrafficText.Text.Length != 0; + selectAllToolStripMenuItem.Enabled = hasText; + clearToolStripMenuItem.Enabled = hasText; } private void printDoc_PrintPage(object sender, PrintPageEventArgs e) @@ -358,5 +337,10 @@ } #endregion + private void clearToolStripMenuItem_Click(object sender, EventArgs e) + { + RawTrafficText.Clear(); + } + } } Modified: trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Properties… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs [iso-8859-1] Wed Aug 26 19:01:26 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.76")] -[assembly: AssemblyFileVersion("1.0.2.76")] +[assembly: AssemblyVersion("1.0.2.80")] +[assembly: AssemblyFileVersion("1.0.2.80")]

15 years

[dreimer] 42940: Fixed a last lil bug in ssvn. Now all should work again.

by dreimer＠svn.reactos.org

Author: dreimer Date: Wed Aug 26 19:00:32 2009 New Revision: 42940 URL: http://svn.reactos.org/svn/reactos?rev=42940&view=rev Log: Fixed a last lil bug in ssvn. Now all should work again. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] Wed Aug 26 19:00:32 2009 @@ -32,8 +32,6 @@ } else { IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' update" } - } - if ("$($arg[1])" -ne "") { "Do you want to see the changelog?" $CL = Read-Host "Please enter 'yes' or 'no': " if (("$CL" -eq "yes") -or ("$CL" -eq "y")) { @@ -87,8 +85,6 @@ # its up to date or not. elseif ("$($args[0])" -eq "status") { $host.ui.RawUI.WindowTitle = "SVN Status" - "This might take a while, so please be patient." - "" $_ROSBE_SSVN_JOB = "status" UP($args) } Modified: trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/sSV… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd [iso-8859-1] Wed Aug 26 19:00:32 2009 @@ -31,8 +31,6 @@ if /i "%1" == "cleanup" ( title SVN Cleaning... - echo This might take a while, so please be patient. - echo. "%_ROSBE_BASEDIR%\Tools\svn.exe" cleanup

15 years

[dreimer] 42939: Tidy up work. Still tbt: config, update, ssvn Fixed the Detection of GCC 4.4.X

by dreimer＠svn.reactos.org

Author: dreimer Date: Wed Aug 26 17:51:36 2009 New Revision: 42939 URL: http://svn.reactos.org/svn/reactos?rev=42939&view=rev Log: Tidy up work. Still tbt: config, update, ssvn Fixed the Detection of GCC 4.4.X Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/chdefdir.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/chdefgcc.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/scut.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] Wed Aug 26 17:51:36 2009 @@ -21,31 +21,27 @@ } # Check if strip, no Debug Symbols or ccache are being used and set the appropriate options. -if ($_ROSBE_NOSTRIP -ne $null) { - if ($_ROSBE_NOSTRIP -eq 1) { - $ENV:ROS_BUILDNOSTRIP = "yes" - } else { - $ENV:ROS_BUILDNOSTRIP = "no" - } +if ($_ROSBE_NOSTRIP -eq 1) { + $ENV:ROS_BUILDNOSTRIP = "yes" +} else { + $ENV:ROS_BUILDNOSTRIP = "no" } -if ($_ROSBE_STRIP -ne $null) { - if ($_ROSBE_STRIP -eq 1) { - $ENV:ROS_LEAN_AND_MEAN = "yes" - } else { - $ENV:ROS_LEAN_AND_MEAN = "no" - } +if ($_ROSBE_STRIP -eq 1) { + $ENV:ROS_LEAN_AND_MEAN = "yes" +} else { + $ENV:ROS_LEAN_AND_MEAN = "no" } # Check if the user has chosen to use a different object or output path and set # it accordingly. -if ($_ROSBE_OBJPATH -ne $null) { +if ("$_ROSBE_OBJPATH" -ne "") { if (Test-Path "$_ROSBE_OBJPATH") { "WARNING: The Object-Path specified doesn't seem to exist. Creating..." } $ENV:ROS_INTERMEDIATE = "$_ROSBE_OBJPATH" $ENV:ROS_TEMPORARY = "$_ROSBE_OBJPATH" } -if ($_ROSBE_OUTPATH -ne $null) { +if ("$_ROSBE_OUTPATH" -ne "") { if (Test-Path "$_ROSBE_OUTPATH") { "WARNING: The Output-Path specified doesn't seem to exist. Creating..." } @@ -70,7 +66,7 @@ $TIMENAME = get-date -f HHmm # Check whether we were called as "makex" or "make" -if ($args[0] -eq "multi") { +if ("$($args[0])" -eq "multi") { $args.setvalue($null, 0) $MAKE_JOBS = "$_ROSBE_MAKEX_JOBS" $TITLE_COMMAND = "makex $($args)" Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 [iso-8859-1] Wed Aug 26 17:51:36 2009 @@ -25,19 +25,19 @@ # Apply modified obj and out paths for deletion. - if ($_ROSBE_OBJPATH -eq $null) { + if ("$_ROSBE_OBJPATH" -eq "") { $OBJCLEANPATH = "$_ROSBE_ROSSOURCEDIR\obj-$ENV:ROS_ARCH" } else { $OBJCLEANPATH = "$_ROSBE_OBJPATH" } - if ($_ROSBE_OUTPATH -eq $null) { + if ("$_ROSBE_OUTPATH" -eq "") { $OUTCLEANPATH = "$_ROSBE_ROSSOURCEDIR\output-$ENV:ROS_ARCH" } else { $OUTCLEANPATH = "$_ROSBE_OUTPATH" } - if ($ENV:ROS_ARCH -eq "i386") { + if ("$ENV:ROS_ARCH" -eq "i386") { $MAKEFILE = "$_ROSBE_ROSSOURCEDIR\makefile.auto" } else { $MAKEFILE = "$_ROSBE_ROSSOURCEDIR\makefile-$ENV:ROS_ARCH.auto" Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 [iso-8859-1] Wed Aug 26 17:51:36 2009 @@ -33,7 +33,7 @@ if ("$VERBOSE" -eq "") { $VERBOSE = "$VERBOSE_B" } - if (($VERBOSE -eq "yes") -or ($VERBOSE -eq "y")) { + if (("$VERBOSE" -eq "yes") -or ("$VERBOSE" -eq "y")) { $RBUILDFLAGS = "-v" } clear-host @@ -52,7 +52,7 @@ if ("$CLEAN" -eq "") { $CLEAN = "$CLEAN_B" } - if (($CLEAN -eq "yes") -or ($CLEAN -eq "y")) { + if (("$CLEAN" -eq "yes") -or ("$CLEAN" -eq "y")) { $RBUILDFLAGS = "$RBUILDFLAGS" + " -c" } clear-host @@ -74,9 +74,9 @@ if ("$DEPENDS" -eq "") { $DEPENDS = "$DEPENDS_B" } - if (($DEPENDS -eq "full") -or ($DEPENDS -eq "f")) { + if (("$DEPENDS" -eq "full") -or ("$DEPENDS" -eq "f")) { $RBUILDFLAGS = "$RBUILDFLAGS" + " -df" - } elseif (($DEPENDS -eq "no") -or ($DEPENDS -eq "n")) { + } elseif (("$DEPENDS" -eq "no") -or ("$DEPENDS" -eq "n")) { $RBUILDFLAGS = "$RBUILDFLAGS" + " -dd" } else { $RBUILDFLAGS = "$RBUILDFLAGS" + " -da" @@ -97,7 +97,7 @@ if ("$PRECHEADER" -eq "") { $PRECHEADER = "$PRECHEADER_B" } - if (($PRECHEADER -eq "no") -or ($PRECHEADER -eq "n")) { + if (("$PRECHEADER" -eq "no") -or ("$PRECHEADER" -eq "n")) { $RBUILDFLAGS = "$RBUILDFLAGS" + " -hd" } clear-host @@ -117,7 +117,7 @@ if ("$MAKEDIR" -eq "") { $MAKEDIR = "$MAKEDIR_B" } - if (($MAKEDIR -eq "yes") -or ($MAKEDIR -eq "y")) { + if (("$MAKEDIR" -eq "yes") -or ("$MAKEDIR" -eq "y")) { $RBUILDFLAGS = "$RBUILDFLAGS" + " -mi" } clear-host @@ -136,7 +136,7 @@ if ("$PROXYMAKE" -eq "") { $PROXYMAKE = "$PROXYMAKE_B" } - if (($PROXYMAKE -eq "yes") -or ($PROXYMAKE -eq "y")) { + if (("$PROXYMAKE" -eq "yes") -or ("$PROXYMAKE" -eq "y")) { $RBUILDFLAGS = "$RBUILDFLAGS" + " -ps" } clear-host @@ -155,7 +155,7 @@ if ("$COMPUNITS" -eq "") { $COMPUNITS = "$COMPUNITS_B" } - if (($COMPUNITS -eq "no") -or ($COMPUNITS -eq "n")) { + if (("$COMPUNITS" -eq "no") -or ("$COMPUNITS" -eq "n")) { $RBUILDFLAGS = "$RBUILDFLAGS" + " -ud" } clear-host @@ -174,7 +174,7 @@ if ("$XML" -eq "") { $XML = "$XML_B" } - if (($XML -eq "yes") -or ($XML -eq "y")) { + if (("$XML" -eq "yes") -or ("$XML" -eq "y")) { $RBUILDFLAGS = "$RBUILDFLAGS" + " -r" } clear-host @@ -183,11 +183,11 @@ } # Receive the first Parameter and decide what to do. -if ($args[0] -eq "delete") { +if ("$args" -eq "delete") { "config.rbuild will be permanently deleted. All your settings will be gone." "Continue?" $YESNO = Read-Host "(yes), (no)" - if (($YESNO -eq "yes") -or ($YESNO -eq "y")) { + if (("$YESNO" -eq "yes") -or ("$YESNO" -eq "y")) { if (Test-Path ".\config.rbuild") { remove-item ".\config.rbuild" "Main Configuration File was found and deleted." @@ -202,6 +202,7 @@ } if (Test-Path "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG") { remove-item "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG" + $ENV:ROS_RBUILDFLAGS = "" "RBuild Flags File was found and deleted." } else { "RBuild Flags File was not found in ReactOS Source Tree." @@ -209,12 +210,12 @@ } settitle } -elseif ($args[0] -eq "update") { +elseif ("$args" -eq "update") { "old config.rbuild will be deleted and will be updated with a recent," "default one. You will need to reconfigure it to your wishes later." "Continue?" $YESNO = Read-Host "(yes), (no)" - if (($YESNO -eq "yes") -or ($YESNO -eq "y")) { + if (("$YESNO" -eq "yes") -or ("$YESNO" -eq "y")) { remove-item "$_ROSBE_BASEDIR\*.rbuild" remove-item ".\config.rbuild" copy-item ".\config.template.rbuild" "$ENV:APPDATA\RosBE\config.rbuild" @@ -222,11 +223,11 @@ } settitle } -elseif ($args[0] -eq "rbuild") { +elseif ("$args" -eq "rbuild") { rbuild settitle } -elseif ($args[0] -ne $null) { +elseif ("$args" -ne "") { "Unknown parameter specified. Try 'help [COMMAND]'." settitle } @@ -245,7 +246,7 @@ "" $YESNO = Read-Host "(yes), (no)" -if (($YESNO -ne "yes") -and ($YESNO -ne "y")) {settitle} +if (("$YESNO" -ne "yes") -and ("$YESNO" -ne "y")) {settitle} # Check if config.template.rbuild is newer than config.rbuild, if it is then # inform the user and offer an update. @@ -258,7 +259,7 @@ "*** previously made settings. ***" "" $YESNO = Read-Host "(yes), (no)" - if (($YESNO -eq "yes") -or ($YESNO -eq "y")) {remove-item "$ENV:APPDATA\RosBE\*.rbuild" | remove-item ".\config.rbuild" | copy-item ".\config.template.rbuild" "$ENV:APPDATA\RosBE\config.rbuild"} + if (("$YESNO" -eq "yes") -or ("$YESNO" -eq "y")) {remove-item "$ENV:APPDATA\RosBE\*.rbuild" | remove-item ".\config.rbuild" | copy-item ".\config.template.rbuild" "$ENV:APPDATA\RosBE\config.rbuild"} else {settitle} } } @@ -289,7 +290,7 @@ $OARCH = $xml.group.property | ? { $_.Name -eq "OARCH" } | % { $_.Value} "Right now: $OARCH" $OARCH_CH = Read-Host -if ($OARCH_CH -eq $null) { +if ("$OARCH_CH" -eq "") { $OARCH_CH = $OARCH } clear-host @@ -302,7 +303,7 @@ $TUNE = $xml.group.property | ? { $_.Name -eq "TUNE" } | % { $_.Value} "Right now: $TUNE" $TUNE_CH = Read-Host -if ($TUNE_CH -eq $null) { +if ("$TUNE_CH" -eq "") { $TUNE_CH = $TUNE } clear-host @@ -317,7 +318,7 @@ $OPTIMIZE = $xml.group.property | ? { $_.Name -eq "OPTIMIZE" } | % { $_.Value} "Right now: $OPTIMIZE" $OPTIMIZE_CH = Read-Host "(0), (1), (2), (3), (4), (5)" -if ($OPTIMIZE_CH -eq $null) { +if ("$OPTIMIZE_CH" -eq "") { $OPTIMIZE_CH = $OPTIMIZE } clear-host @@ -328,7 +329,7 @@ $KDBG = $xml.group.property | ? { $_.Name -eq "KDBG" } | % { $_.Value} "Right now: $KDBG" $KDBG_CH = Read-Host "(0), (1)" -if ($KDBG_CH -eq $null) { +if ("$KDBG_CH" -eq "") { $KDBG_CH = $KDBG } clear-host @@ -340,7 +341,7 @@ $DBG = $xml.group.property | ? { $_.Name -eq "DBG" } | % { $_.Value} "Right now: $DBG" $DBG_CH = Read-Host "(0), (1)" -if ($KDBG_CH -eq $null) { +if ("$KDBG_CH" -eq "") { $DBG_CH = $DBG } clear-host @@ -352,7 +353,7 @@ $GDB = $xml.group.property | ? { $_.Name -eq "GDB" } | % { $_.Value} "Right now: $GDB" $GDB_CH = Read-Host "(0), (1)" -if ($GDB_CH -eq $null) { +if ("$GDB_CH" -eq "") { $GDB_CH = $GDB } clear-host @@ -366,7 +367,7 @@ $NSWPAT = $xml.group.property | ? { $_.Name -eq "NSWPAT" } | % { $_.Value} "Right now: $NSWPAT" $NSWPAT_CH = Read-Host "(0), (1)" -if ($NSWPAT_CH -eq $null) { +if ("$NSWPAT_CH" -eq "") { $NSWPAT_CH = $NSWPAT } clear-host @@ -382,7 +383,7 @@ $WINKD = $xml.group.property | ? { $_.Name -eq "_WINKD_" } | % { $_.Value} "Right now: $WINKD" $WINKD_CH = Read-Host "(0), (1)" -if ($WINKD_CH -eq $null) { +if ("$WINKD_CH" -eq "") { $WINKD_CH = $WINKD } clear-host @@ -394,7 +395,7 @@ $ELF = $xml.group.property | ? { $_.Name -eq "_ELF_" } | % { $_.Value} "Right now: $ELF" $ELF_CH = Read-Host "(0), (1)" -if ($ELF_CH -eq $null) { +if ("$ELF_CH" -eq "") { $ELF_CH = $ELF } clear-host @@ -405,7 +406,7 @@ $BUILD_MP = $xml.group.property | ? { $_.Name -eq "BUILD_MP" } | % { $_.Value} "Right now: $BUILD_MP" $BUILD_MP_CH = Read-Host "(0), (1)" -if ($BUILD_MP_CH -eq $null) { +if ("$BUILD_MP_CH" -eq "") { $BUILD_MP_CH = $BUILD_MP } clear-host Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Wed Aug 26 17:51:36 2009 @@ -19,12 +19,12 @@ # Set defaults to work with and override them if edited by # the options utility. -if ($args[0] -eq $null) { +if ("$args" -eq "") { $ENV:ROS_ARCH = "i386" } else { $ENV:ROS_ARCH = "$($args)" } -if ($ENV:ROS_ARCH -eq "amd64") { +if ("$ENV:ROS_ARCH" -eq "amd64") { (Get-Host).UI.RawUI.ForegroundColor = 0xB (Get-Host).UI.RawUI.BackgroundColor = 0x0 } else { @@ -128,14 +128,14 @@ } # Load the user's options if any -if ($args[0] -eq $null) { +if ("$args" -eq "") { if (Test-Path "$ENV:APPDATA\RosBE\rosbe-options.ps1") { & "$ENV:APPDATA\RosBE\rosbe-options.ps1" } } -if (Test-Path "$ENV:APPDATA\RosBE\rosbe-options-$args.ps1") { - & "$ENV:APPDATA\RosBE\rosbe-options-$args.ps1" +if (Test-Path "$ENV:APPDATA\RosBE\rosbe-options-$ENV:ROS_ARCH.ps1") { + & "$ENV:APPDATA\RosBE\rosbe-options-$ENV:ROS_ARCH.ps1" } if (Test-Path "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG") { @@ -168,7 +168,7 @@ if (Test-Path "$_ROSBE_BASEDIR\scut.ps1") { & "$_ROSBE_BASEDIR\scut.ps1" } -if ($_ROSBE_SHOWVERSION -eq "1") { +if ($_ROSBE_SHOWVERSION -eq 1) { & "$_ROSBE_BASEDIR\version.ps1" } Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 [iso-8859-1] Wed Aug 26 17:51:36 2009 @@ -22,7 +22,7 @@ $ENV:ROS_ARCH = $ARCH # Refresh all needed Params by recalling the main Path setting CMD File. -if ($ENV:ROS_ARCH -eq "i386") { +if ("$ENV:ROS_ARCH" -eq "i386") { if (Test-Path "$ENV:APPDATA\RosBE\rosbe-options.ps1") { IEX "& '$ENV:APPDATA\RosBE\rosbe-options.ps1'" } Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/chdefdir.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/chdefdir.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/chdefdir.ps1 [iso-8859-1] Wed Aug 26 17:51:36 2009 @@ -19,7 +19,7 @@ } else { $SOURCEDIR = $args } -if ($SOURCEDIR -eq "previous") { +if ("$SOURCEDIR" -eq "previous") { pop-location } else { if (!(Test-Path "$SOURCEDIR\.")) { Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/chdefgcc.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/chdefgcc.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/chdefgcc.ps1 [iso-8859-1] Wed Aug 26 17:51:36 2009 @@ -22,14 +22,14 @@ # Parse the command line arguments. Ask the user if certain parameters are missing. $TOOLPATH = $args[0] $TOOLMODE = $args[1] -if ($TOOLPATH -eq $null) { +if ("$TOOLPATH" -eq "") { $TOOLPATH = Read-Host "Please enter a MinGW/GCC directory (don't use quotes): " if ($TOOLPATH.length -eq 0) { "ERROR: You must enter a MinGW/GCC directory." settitle } } -if ($TOOLMODE -eq $null) { +if ("$TOOLMODE" -eq "") { $TOOLMODE = Read-Host "Please specify, if this will be the Target or Host GCC: " if ($TOOLMODE.length -eq 0) { "ERROR: You must enter ""target"" or ""host""." @@ -52,11 +52,11 @@ } # Set the values -if ($TOOLMODE -eq "target") { +if ("$TOOLMODE" -eq "target") { $_ROSBE_TARGET_MINGWPATH = $TOOLPATH "Target Location: $_ROSBE_TARGET_MINGWPATH" EOA -} elseif ($TOOLMODE -eq "host") { +} elseif ("$TOOLMODE" -eq "host") { $_ROSBE_HOST_MINGWPATH = $TOOLPATH "Host Location: $_ROSBE_HOST_MINGWPATH" EOA Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1 [iso-8859-1] Wed Aug 26 17:51:36 2009 @@ -13,7 +13,7 @@ $FILEPATH = $args[0] $ADDRESS = $args[1] if ($args.length -lt 1) { - if ($FILEPATH -eq $null) { + if ("$FILEPATH" -eq "") { $FILEPATH = Read-Host "Please enter the path/file to be examined: " if ($FILEPATH.Contains("\")) { $FILEPATH = get-childitem "$FILEPATH\*" -name -recurse 2>NUL | select-string "$FILEPATH" @@ -21,22 +21,20 @@ } } elseif ($args.length -lt 2) { - if ($ADDRESS -eq $null) { + if ("$ADDRESS" -eq "") { $ADDRESS = Read-Host "Please enter the address you would like to analyze: " } } # Check if parameters were really given -if ($FILEPATH -eq $null) { +if ("$FILEPATH" -eq "") { "ERROR: You must specify a path/file to examine." } -if ($ADDRESS -eq $null) { +if ("$ADDRESS" -eq "") { "ERROR: You must specify a address to analyze." } - $baseaddr = (objdump -p $FILEPATH | select-string "ImageBase").tostring().split() $baseaddr = "0x" + ($baseaddr.get($baseaddr.length - 1)) - if ($baseaddr -lt $ADDRESS) { IEX "& '$_ROSBE_BASEDIR\Tools\raddr2line.exe' '$FILEPATH' '$ADDRESS'" } else { Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] Wed Aug 26 17:51:36 2009 @@ -24,11 +24,11 @@ $TARGETGCC = "$global:_ROSBE_PREFIX" + "gcc" & $TARGETGCC -v 2> gcctvers.tmp $global:_ROSBE_TARGET_GCCVERSION = (select-string -path .\gcctvers.tmp "gcc version") -replace ".*version ((\d|\.)+).*",'$1' -$global:_ROSBE_TARGET_GCCTARGET = (select-string -path .\gcctvers.tmp "target=") -replace ".*--target=(.+?)\b.*",'$1' +$global:_ROSBE_TARGET_GCCTARGET = (select-string -path .\gcctvers.tmp "Target: ") -replace ".*Target: (.+?)\b.*",'$1' remove-item gcctvers.tmp gcc -v 2> gcchvers.tmp $global:_ROSBE_HOST_GCCVERSION = (select-string -path .\gcchvers.tmp "gcc version") -replace ".*version ((\d|\.)+).*",'$1' -$global:_ROSBE_HOST_GCCTARGET = (select-string -path .\gcchvers.tmp "target=") -replace ".*--target=(.+?)\b.*",'$1' +$global:_ROSBE_HOST_GCCTARGET = (select-string -path .\gcchvers.tmp "Target: ") -replace ".*Target: (.+?)\b.*",'$1' remove-item gcchvers.tmp $ENV:ROSBE_HOST_CFLAGS = "-I""$_ROSBE_HOST_MINGWPATH\include"" -I""$_ROSBE_HOST_MINGWPATH\lib\gcc\$_ROSBE_HOST_GCCTARGET\$_ROSBE_HOST_GCCVERSION\include""" Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] Wed Aug 26 17:51:36 2009 @@ -7,7 +7,7 @@ # # -function UP { +function UP($arg) { $OFFSVN = IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' info" | select-string "Revision:" $OFFSVN = $OFFSVN -replace "(.*)Revision: ",'' $OFFSVN = [CONVERT]::ToInt32($OFFSVN,10) @@ -17,27 +17,29 @@ "Local Revision: $OFFSVN" "Online HEAD Revision: $ONSVN" "" - if ($OFFSVN -lt $ONSVN) { - if ($_ROSBE_SSVN_JOB -eq "status") { + if (($OFFSVN -lt $ONSVN) -or ("$($arg[1])" -ne "")) { + if ("$_ROSBE_SSVN_JOB" -eq "status") { "Your tree is not up to date. Do you want to update it?" $UP = Read-Host "Please enter 'yes' or 'no': " - if (($UP -eq "yes") -or ($UP -eq "y")) { + if (("$UP" -eq "yes") -or ("$UP" -eq "y")) { $_ROSBE_SSVN_JOB = "update" } } - if ($_ROSBE_SSVN_JOB -eq "update") { - if ($args[1] -ne $null) { - $temparg = $args[1] + if ("$_ROSBE_SSVN_JOB" -eq "update") { + if ("$($arg[1])" -ne "") { + $temparg = $arg[1] IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' update -r $temparg" } else { IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' update" } } - "Do you want to see the changelog?" - $CL = Read-Host "Please enter 'yes' or 'no': " - if (($CL -eq "yes") -or ($CL -eq "y")) { - $range = $OFFSVN + ":" + $ONSVN - IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' log -r $range" + if ("$($arg[1])" -ne "") { + "Do you want to see the changelog?" + $CL = Read-Host "Please enter 'yes' or 'no': " + if (("$CL" -eq "yes") -or ("$CL" -eq "y")) { + $range = "$OFFSVN" + ":" + "$ONSVN" + IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' log -r $range" + } } } if ($OFFSVN -eq $ONSVN) { @@ -46,19 +48,19 @@ } # Receive the first parameter and decide what to do. -if ($args[0] -eq $null) { +if ("$($args[0])" -eq "") { "No parameter specified. Try 'help [COMMAND]'." } # These two are directly parsed to svn. -elseif ($args[0] -eq "update") { +elseif ("$($args[0])" -eq "update") { $host.ui.RawUI.WindowTitle = "SVN Updating..." "This might take a while, so please be patient." "" $_ROSBE_SSVN_JOB = "update" - UP + UP($args) } -elseif ($args[0] -eq "cleanup") { +elseif ("$($args[0])" -eq "cleanup") { $host.ui.RawUI.WindowTitle = "SVN Cleaning..." "This might take a while, so please be patient." "" @@ -66,14 +68,14 @@ } # Check if the folder is empty. If not, output an error. -elseif ($args[0] -eq "create") { +elseif ("$($args[0])" -eq "create") { $host.ui.RawUI.WindowTitle = "SVN Creating..." if (Test-Path ".svn\.") { "ERROR: Folder already contains a repository." } else { $null = (Remove-Item "$_ROSBE_LOGDIR" -recurse -force) $dir = get-childitem - if ($dir -eq $null) { + if ("$dir" -eq "") { IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' checkout svn://svn.reactos.org/reactos/trunk/reactos ." } else { "ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED" @@ -83,15 +85,15 @@ # Output the revision of the local and online trees and tell the user if # its up to date or not. -elseif ($args[0] -eq "status") { +elseif ("$($args[0])" -eq "status") { $host.ui.RawUI.WindowTitle = "SVN Status" "This might take a while, so please be patient." "" $_ROSBE_SSVN_JOB = "status" - UP + UP($args) } -elseif ($args[0] -ne $null) { +elseif ("$($args[0])" -ne "") { "Unknown parameter specified. Try 'help ssvn'." } Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/scut.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/scut.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/scut.ps1 [iso-8859-1] Wed Aug 26 17:51:36 2009 @@ -14,7 +14,7 @@ $OUT = paramcall($arg) # It's a shortcut name, so change the directory - if ($OUT -ne "Default") { + if ("$OUT" -ne "Default") { if (Test-Path "$OUT\.") { set-location $OUT $_ROSBE_ROSSOURCEDIR = $OUT @@ -23,14 +23,14 @@ } # Check if the parameter is an scut parameter, which can just be forwarded to the EXE file -if ($args[0] -eq "add") {paramcall($args)} -elseif ($args[0] -eq "rem") {paramcall($args)} -elseif ($args[0] -eq "edit") {paramcall($args)} -elseif ($args[0] -eq "def") {paramcall($args)} -elseif ($args[0] -eq "list") {paramcall($args)} -elseif ($args[0] -eq "/?") {paramcall($args)} -elseif ($args[0] -eq "-h") {paramcall($args)} -elseif ($args[0] -eq "--help") {paramcall($args)} +if ("$($args[0])" -eq "add") {paramcall($args)} +elseif ("$($args[0])" -eq "rem") {paramcall($args)} +elseif ("$($args[0])" -eq "edit") {paramcall($args)} +elseif ("$($args[0])" -eq "def") {paramcall($args)} +elseif ("$($args[0])" -eq "list") {paramcall($args)} +elseif ("$($args[0])" -eq "/?") {paramcall($args)} +elseif ("$($args[0])" -eq "-h") {paramcall($args)} +elseif ("$($args[0])" -eq "--help") {paramcall($args)} else {parse($args)} $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 [iso-8859-1] Wed Aug 26 17:51:36 2009 @@ -28,7 +28,7 @@ "" "Install?" $YESNO = Read-Host "(yes), (no)" - if (($YESNO -eq "yes") -or ($YESNO -eq "y")) { + if (("$YESNO" -eq "yes") -or ("$YESNO" -eq "y")) { if (!(Test-Path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.7z")) { get-webfile $_ROSBE_URL/$_ROSBE_VERSION-$_ROSBE_STATCOUNT.7z $PWD\$_ROSBE_VERSION-$_ROSBE_STATCOUNT.7z } @@ -42,16 +42,16 @@ "ERROR: This Update does not seem to exist or the Internet connection is not working correctly." return } - } elseif ($YESNO -eq "no") { + } elseif ("$YESNO" -eq "no") { "Do you want to be asked again to install this update?" $YESNO = Read-Host "(yes), (no)" - if (($YESNO -eq "yes") -or ($YESNO -eq "y")) { + if (("$YESNO" -eq "yes") -or ("$YESNO" -eq "y")) { remove-item "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt" -force -EA SilentlyContinue } return } } else { - if ($_ROSBE_MULTIUPD -ne "1") { + if ($_ROSBE_MULTIUPD -ne 1) { "ERROR: This Update does not seem to exist or the Internet connection is not working correctly." } $_ROSBE_STATCOUNT = 9 @@ -89,11 +89,6 @@ if (!(Test-Path "$ENV:APPDATA\RosBE\Updates")) {New-Item -path "$ENV:APPDATA\RosBE" -name "Updates" -type directory} set-location "$ENV:APPDATA\RosBE\Updates" -# Parse the args. - -$arg1 = $args[0] -$arg2 = $args[1] - if ("$args" -eq "") { $_ROSBE_MULTIUPD = 1 $_ROSBE_STATCOUNT = 1 @@ -104,17 +99,17 @@ } elseif ("$args" -eq "reset") { remove-item "$ENV:APPDATA\RosBE\Updates\*.*" -force -recurse -EA SilentlyContinue remove-item "$ENV:APPDATA\RosBE\Updates\tmp\*.*" -force -recurse -EA SilentlyContinue -} elseif ("$arg1" -eq "nr") { - $_ROSBE_STATCOUNT = $arg2 +} elseif ("$($args[0])" -eq "nr") { + $_ROSBE_STATCOUNT = $($args[1]) UPDCHECK -} elseif ("$arg1" -eq "delete") { - $_ROSBE_STATCOUNT = $arg2 +} elseif ("$($args[0])" -eq "delete") { + $_ROSBE_STATCOUNT = $($args[1]) remove-item "$ENV:APPDATA\RosBE\Updates\$_ROSBE_VERSION-$_ROSBE_STATCOUNT.*" -force -recurse -EA SilentlyContinue remove-item "$ENV:APPDATA\RosBE\Updates\tmp\$_ROSBE_VERSION-$_ROSBE_STATCOUNT.*" -force -recurse -EA SilentlyContinue -} elseif ("$arg1" -eq "info") { - $_ROSBE_STATCOUNT = $arg2 +} elseif ("$($args[0])" -eq "info") { + $_ROSBE_STATCOUNT = $($args[1]) set-location tmp - if (!(Test-path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt")) { + if (!(Test-Path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt")) { get-webfile $_ROSBE_URL/$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt $PWD\$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt if (Test-Path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt") { get-content "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt" @@ -129,8 +124,8 @@ if (!(test-path "tmp")) {New-Item -name "tmp" -type directory} copy-item *.txt .\tmp\. set-location tmp - while($_ROSBE_STATCOUNT -lt 10) { - if (!(Test-path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt")) { + while ($_ROSBE_STATCOUNT -lt 10) { + if (!(Test-Path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt")) { get-webfile $_ROSBE_URL/$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt $PWD\$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt if (Test-Path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt") { $_ROSBE_UPDATES += "$_ROSBE_STATCOUNT " @@ -142,7 +137,7 @@ } set-location .. remove-item "tmp\*.*" -force -EA SilentlyContinue - if ($_ROSBE_UPDATES -ne $null) { + if ("$_ROSBE_UPDATES" -ne "") { "Following Updates available: $_ROSBE_UPDATES" } else { "RosBE is up to Date."

15 years

[gschneider] 42938: - Rename "connected" to "state"; introduce three possible states: not connected, waiting (for a connection or while in kdbg) and debug; bug #4814 - Don't send commands to kdbg without being connected, notice if a user leaves kdbg manually by entering "cont" - Add subtypes to project file

by gschneider＠svn.reactos.org

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

15 years

[sginsberg] 42937: - Fix a bug in KiRaiseException from 42923 -- a _SEH2_LEAVE wasn't converted to _SEH2_YIELD

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Wed Aug 26 16:52:00 2009 New Revision: 42937 URL: http://svn.reactos.org/svn/reactos?rev=42937&view=rev Log: - Fix a bug in KiRaiseException from 42923 -- a _SEH2_LEAVE wasn't converted to _SEH2_YIELD Modified: trunk/reactos/ntoskrnl/ke/except.c Modified: trunk/reactos/ntoskrnl/ke/except.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/except.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/ke/except.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/except.c [iso-8859-1] Wed Aug 26 16:52:00 2009 @@ -95,7 +95,6 @@ CONTEXT LocalContext; EXCEPTION_RECORD LocalExceptionRecord; ULONG ParameterCount, Size; - NTSTATUS Status = STATUS_SUCCESS; /* Check if we need to probe */ if (PreviousMode != KernelMode) @@ -117,8 +116,7 @@ EXCEPTION_MAXIMUM_PARAMETERS) { /* Too large */ - Status = STATUS_INVALID_PARAMETER; - _SEH2_LEAVE; + _SEH2_YIELD(return STATUS_INVALID_PARAMETER); } /* Probe the entire parameters now*/ @@ -162,8 +160,8 @@ PreviousMode, SearchFrames); - /* Return the status */ - return Status; + /* We are done */ + return STATUS_SUCCESS; } /* EOF */

15 years

← Newer
1
2
3
4
5
6
7
...
66
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 August 2009