Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gedmurphy] 41260: Make the horizontal and vertical axis in the history graphs solid lines instead of the dotted 80's style we had.
by gedmurphy＠svn.reactos.org 02 Jun '09

02 Jun '09

Author: gedmurphy Date: Tue Jun 2 23:09:03 2009 New Revision: 41260 URL: http://svn.reactos.org/svn/reactos?rev=41260&view=rev Log: Make the horizontal and vertical axis in the history graphs solid lines instead of the dotted 80's style we had. Modified: trunk/reactos/base/applications/taskmgr/graphctl.c trunk/reactos/base/applications/taskmgr/perfpage.c Modified: trunk/reactos/base/applications/taskmgr/graphctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/graphctl.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/graphctl.c [iso-8859-1] Tue Jun 2 23:09:03 2009 @@ -77,7 +77,7 @@ /* background, grid and data colors */ /* these are public variables and can be set directly */ this->m_crBackColor = RGB( 0, 0, 0); /* see also SetBackgroundColor */ - this->m_crGridColor = RGB( 0, 255, 255); /* see also SetGridColor */ + this->m_crGridColor = RGB( 0, 128, 64); /* see also SetGridColor */ this->m_crPlotColor[0] = RGB(255, 255, 255); /* see also SetPlotColor */ this->m_crPlotColor[1] = RGB(100, 255, 255); /* see also SetPlotColor */ this->m_crPlotColor[2] = RGB(255, 100, 255); /* see also SetPlotColor */ @@ -189,7 +189,7 @@ /* There is a lot of drawing going on here - particularly in terms of */ /* drawing the grid. Don't panic, this is all being drawn (only once) */ /* to a bitmap. The result is then BitBlt'd to the control whenever needed. */ - int i, j; + int i; int nCharacters; int nTopGridPix, nMidGridPix, nBottomGridPix; @@ -249,33 +249,27 @@ LineTo(this->m_dcGrid, this->m_rectPlot.right+1, this->m_rectPlot.bottom+1); LineTo(this->m_dcGrid, this->m_rectPlot.left, this->m_rectPlot.bottom+1); /* LineTo(m_dcGrid, m_rectPlot.left, m_rectPlot.top); */ - SelectObject(this->m_dcGrid, oldPen); - DeleteObject(solidPen); - - /* draw the dotted lines, - * use SetPixel instead of a dotted pen - this allows for a - * finer dotted line and a more "technical" look - */ + + /* draw the horizontal and vertical axis */ nMidGridPix = (this->m_rectPlot.top + this->m_rectPlot.bottom)/2; nTopGridPix = nMidGridPix - this->m_nPlotHeight/4; nBottomGridPix = nMidGridPix + this->m_nPlotHeight/4; - for (i=this->m_rectPlot.left; i<this->m_rectPlot.right; i+=2) - { - SetPixel(this->m_dcGrid, i, nTopGridPix, this->m_crGridColor); - SetPixel(this->m_dcGrid, i, nMidGridPix, this->m_crGridColor); - SetPixel(this->m_dcGrid, i, nBottomGridPix, this->m_crGridColor); - } - - for (i=this->m_rectPlot.left; i<this->m_rectPlot.right; i+=10) - { - for (j=this->m_rectPlot.top; j<this->m_rectPlot.bottom; j+=2) - { - SetPixel(this->m_dcGrid, i, j, this->m_crGridColor); - /* SetPixel(m_dcGrid, i, j, m_crGridColor); */ - /* SetPixel(m_dcGrid, i, j, m_crGridColor); */ - } - } + MoveToEx(this->m_dcGrid, this->m_rectPlot.left, nTopGridPix, NULL); + LineTo(this->m_dcGrid, this->m_rectPlot.right, nTopGridPix); + MoveToEx(this->m_dcGrid, this->m_rectPlot.left, nMidGridPix, NULL); + LineTo(this->m_dcGrid, this->m_rectPlot.right, nMidGridPix); + MoveToEx(this->m_dcGrid, this->m_rectPlot.left, nBottomGridPix, NULL); + LineTo(this->m_dcGrid, this->m_rectPlot.right, nBottomGridPix); + + for (i = this->m_rectPlot.left; i<this->m_rectPlot.right; i+=13) + { + MoveToEx(this->m_dcGrid, this->m_rectPlot.left + i, this->m_rectPlot.bottom, NULL); + LineTo(this->m_dcGrid, this->m_rectPlot.left + i, this->m_rectPlot.top); + } + + SelectObject(this->m_dcGrid, oldPen); + DeleteObject(solidPen); #if 0 /* create some fonts (horizontal and vertical) */ Modified: trunk/reactos/base/applications/taskmgr/perfpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/perfpage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/perfpage.c [iso-8859-1] Tue Jun 2 23:09:03 2009 @@ -178,7 +178,7 @@ /* PerformancePageCpuUsageHistoryGraph.SetGridColor(RGB(192, 192, 255)) ; */ /* PerformancePageCpuUsageHistoryGraph.SetPlotColor(RGB(255, 255, 255)) ; */ GraphCtrl_SetBackgroundColor(&PerformancePageCpuUsageHistoryGraph, RGB(0, 0, 0)) ; - GraphCtrl_SetGridColor(&PerformancePageCpuUsageHistoryGraph, RGB(152, 205, 152)) ; + GraphCtrl_SetGridColor(&PerformancePageCpuUsageHistoryGraph, RGB(0, 128, 64)); GraphCtrl_SetPlotColor(&PerformancePageCpuUsageHistoryGraph, 0, RGB(0, 255, 0)) ; GraphCtrl_SetPlotColor(&PerformancePageCpuUsageHistoryGraph, 1, RGB(255, 0, 0)) ; @@ -188,7 +188,7 @@ GraphCtrl_Create(&PerformancePageMemUsageHistoryGraph, hPerformancePageMemUsageHistoryGraph, hDlg, IDC_MEM_USAGE_HISTORY_GRAPH); GraphCtrl_SetRange(&PerformancePageMemUsageHistoryGraph, 0.0, 100.0, 10) ; GraphCtrl_SetBackgroundColor(&PerformancePageMemUsageHistoryGraph, RGB(0, 0, 0)) ; - GraphCtrl_SetGridColor(&PerformancePageMemUsageHistoryGraph, RGB(152, 215, 152)) ; + GraphCtrl_SetGridColor(&PerformancePageMemUsageHistoryGraph, RGB(0, 128, 64)) ; GraphCtrl_SetPlotColor(&PerformancePageMemUsageHistoryGraph, 0, RGB(255, 255, 0)) ; /* Start our refresh thread */ #ifdef RUN_PERF_PAGE

1 0

[cwittich] 41259: -set accept and cancel buttons for connect and settings dialog -fix next debugger command by waiting for kdbg to respond
by cwittich＠svn.reactos.org 02 Jun '09

02 Jun '09

Author: cwittich Date: Tue Jun 2 23:05:54 2009 New Revision: 41259 URL: http://svn.reactos.org/svn/reactos?rev=41259&view=rev Log: -set accept and cancel buttons for connect and settings dialog -fix next debugger command by waiting for kdbg to respond Modified: trunk/tools/reactosdbg/DebugProtocol/KDBG.cs trunk/tools/reactosdbg/RosDBG/Connect.Designer.cs trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs trunk/tools/reactosdbg/RosDBG/Settings.Designer.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] Tue Jun 2 23:05:54 2009 @@ -3,6 +3,7 @@ using System.Linq; using System.Text; using System.Text.RegularExpressions; +using System.Threading; using System.Globalization; using AbstractPipe; using DebugProtocol; @@ -369,6 +370,7 @@ public void Next() { QueueCommand("next"); + Thread.Sleep(100); GetRegisterUpdate(); GetModuleUpdate(); GetProcesses(); Modified: trunk/tools/reactosdbg/RosDBG/Connect.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Connect.De… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Connect.Designer.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Connect.Designer.cs [iso-8859-1] Tue Jun 2 23:05:54 2009 @@ -30,23 +30,23 @@ { this.tabControl = new System.Windows.Forms.TabControl(); this.tabSerial = new System.Windows.Forms.TabPage(); + this.label2 = new System.Windows.Forms.Label(); + this.label3 = new System.Windows.Forms.Label(); + this.cBaud = new System.Windows.Forms.ComboBox(); + this.cPort = new System.Windows.Forms.ComboBox(); this.tabPipe = new System.Windows.Forms.TabPage(); - this.btnCancel = new System.Windows.Forms.Button(); - this.btnOK = new System.Windows.Forms.Button(); this.label1 = new System.Windows.Forms.Label(); this.cType = new System.Windows.Forms.ComboBox(); this.CustomRadioBtn = new System.Windows.Forms.RadioButton(); this.DefaultRadioBtn = new System.Windows.Forms.RadioButton(); this.PipeNameTextBox = new System.Windows.Forms.TextBox(); - this.label2 = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); - this.cBaud = new System.Windows.Forms.ComboBox(); - this.cPort = new System.Windows.Forms.ComboBox(); this.tabSocket = new System.Windows.Forms.TabPage(); this.PortNumber = new System.Windows.Forms.NumericUpDown(); this.label4 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); this.HostChoice = new System.Windows.Forms.ComboBox(); + this.btnCancel = new System.Windows.Forms.Button(); + this.btnOK = new System.Windows.Forms.Button(); this.tabControl.SuspendLayout(); this.tabSerial.SuspendLayout(); this.tabPipe.SuspendLayout(); @@ -79,6 +79,48 @@ this.tabSerial.TabIndex = 0; this.tabSerial.Text = "Serial"; this.tabSerial.UseVisualStyleBackColor = true; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(88, 102); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(32, 13); + this.label2.TabIndex = 10; + this.label2.Text = "Baud"; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(88, 63); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(26, 13); + this.label3.TabIndex = 9; + this.label3.Text = "Port"; + // + // cBaud + // + this.cBaud.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cBaud.FormattingEnabled = true; + this.cBaud.Items.AddRange(new object[] { + "9600", + "19200", + "38400", + "57600", + "115200"}); + this.cBaud.Location = new System.Drawing.Point(126, 99); + this.cBaud.Name = "cBaud"; + this.cBaud.Size = new System.Drawing.Size(121, 21); + this.cBaud.TabIndex = 8; + // + // cPort + // + this.cPort.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cPort.FormattingEnabled = true; + this.cPort.Location = new System.Drawing.Point(126, 60); + this.cPort.Name = "cPort"; + this.cPort.Size = new System.Drawing.Size(121, 21); + this.cPort.TabIndex = 7; // // tabPipe // @@ -95,28 +137,6 @@ this.tabPipe.Text = "Named Pipe"; this.tabPipe.UseVisualStyleBackColor = true; // - // btnCancel - // - this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.btnCancel.Location = new System.Drawing.Point(266, 225); - this.btnCancel.Name = "btnCancel"; - this.btnCancel.Size = new System.Drawing.Size(89, 27); - this.btnCancel.TabIndex = 1; - this.btnCancel.Text = "&Cancel"; - this.btnCancel.UseVisualStyleBackColor = true; - this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click); - // - // btnOK - // - this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK; - this.btnOK.Location = new System.Drawing.Point(171, 225); - this.btnOK.Name = "btnOK"; - this.btnOK.Size = new System.Drawing.Size(89, 27); - this.btnOK.TabIndex = 2; - this.btnOK.Text = "&OK"; - this.btnOK.UseVisualStyleBackColor = true; - this.btnOK.Click += new System.EventHandler(this.btnOK_Click); - // // label1 // this.label1.AutoSize = true; @@ -168,48 +188,6 @@ this.PipeNameTextBox.Name = "PipeNameTextBox"; this.PipeNameTextBox.Size = new System.Drawing.Size(213, 20); this.PipeNameTextBox.TabIndex = 10; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(88, 102); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(32, 13); - this.label2.TabIndex = 10; - this.label2.Text = "Baud"; - // - // label3 - // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(88, 63); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(26, 13); - this.label3.TabIndex = 9; - this.label3.Text = "Port"; - // - // cBaud - // - this.cBaud.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cBaud.FormattingEnabled = true; - this.cBaud.Items.AddRange(new object[] { - "9600", - "19200", - "38400", - "57600", - "115200"}); - this.cBaud.Location = new System.Drawing.Point(126, 99); - this.cBaud.Name = "cBaud"; - this.cBaud.Size = new System.Drawing.Size(121, 21); - this.cBaud.TabIndex = 8; - // - // cPort - // - this.cPort.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cPort.FormattingEnabled = true; - this.cPort.Location = new System.Drawing.Point(126, 60); - this.cPort.Name = "cPort"; - this.cPort.Size = new System.Drawing.Size(121, 21); - this.cPort.TabIndex = 7; // // tabSocket // @@ -273,10 +251,34 @@ this.HostChoice.TabIndex = 4; this.HostChoice.Text = "localhost"; // + // btnCancel + // + this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.btnCancel.Location = new System.Drawing.Point(266, 225); + this.btnCancel.Name = "btnCancel"; + this.btnCancel.Size = new System.Drawing.Size(89, 27); + this.btnCancel.TabIndex = 1; + this.btnCancel.Text = "&Cancel"; + this.btnCancel.UseVisualStyleBackColor = true; + this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click); + // + // btnOK + // + this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK; + this.btnOK.Location = new System.Drawing.Point(171, 225); + this.btnOK.Name = "btnOK"; + this.btnOK.Size = new System.Drawing.Size(89, 27); + this.btnOK.TabIndex = 2; + this.btnOK.Text = "&OK"; + this.btnOK.UseVisualStyleBackColor = true; + this.btnOK.Click += new System.EventHandler(this.btnOK_Click); + // // Connect // + this.AcceptButton = this.btnOK; this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.CancelButton = this.btnCancel; this.ClientSize = new System.Drawing.Size(361, 261); this.Controls.Add(this.btnOK); this.Controls.Add(this.btnCancel); 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] Tue Jun 2 23:05:54 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.20")] -[assembly: AssemblyFileVersion("1.0.2.20")] +[assembly: AssemblyVersion("1.0.2.24")] +[assembly: AssemblyFileVersion("1.0.2.24")] Modified: trunk/tools/reactosdbg/RosDBG/Settings.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Settings.D… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Settings.Designer.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Settings.Designer.cs [iso-8859-1] Tue Jun 2 23:05:54 2009 @@ -80,6 +80,7 @@ // CancelBtn // this.CancelBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.CancelBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel; this.CancelBtn.Location = new System.Drawing.Point(337, 3); this.CancelBtn.Name = "CancelBtn"; this.CancelBtn.Size = new System.Drawing.Size(75, 23); @@ -90,10 +91,15 @@ // // Settings // + this.AcceptButton = this.OKBtn; this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.CancelButton = this.CancelBtn; this.ClientSize = new System.Drawing.Size(415, 317); this.Controls.Add(this.splitContainer1); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.MaximizeBox = false; + this.MinimizeBox = false; this.Name = "Settings"; this.ShowInTaskbar = false; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;

1 0

[cgutman] 41258: - Enable the code in NdisSetTimerEx - Add a debug print
by cgutman＠svn.reactos.org 02 Jun '09

02 Jun '09

Author: cgutman Date: Tue Jun 2 22:20:15 2009 New Revision: 41258 URL: http://svn.reactos.org/svn/reactos?rev=41258&view=rev Log: - Enable the code in NdisSetTimerEx - Add a debug print Modified: trunk/reactos/drivers/network/ndis/ndis/time.c Modified: trunk/reactos/drivers/network/ndis/ndis/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/time.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/time.c [iso-8859-1] Tue Jun 2 22:20:15 2009 @@ -243,6 +243,9 @@ KeSetTimer (&Timer->Timer, Timeout, &Timer->Dpc); } +/* + * @implemented + */ VOID EXPORT NdisSetTimerEx( @@ -250,18 +253,12 @@ IN UINT MillisecondsToDelay, IN PVOID FunctionContext) { -#if 0 - /* FIXME: I'm not sure how to this in a nice way - * We can't store the function context anywhere in NDIS_TIMER - * so I'm forced to do this - */ + NDIS_DbgPrint(MAX_TRACE, ("Called. Timer is: 0x%x, Timeout is: %ld, FunctionContext is: 0x%x\n", + Timer, MillisecondsToDelay, FunctionContext)); Timer->Dpc.DeferredContext = FunctionContext; NdisSetTimer(Timer, MillisecondsToDelay); -#else - UNIMPLEMENTED -#endif } /* EOF */

1 0

[gedmurphy] 41257: bug3954 missed some styles. Updated English resource, can Gabriel or anyone else do the rest.
by gedmurphy＠svn.reactos.org 02 Jun '09

02 Jun '09

Author: gedmurphy Date: Tue Jun 2 18:58:02 2009 New Revision: 41257 URL: http://svn.reactos.org/svn/reactos?rev=41257&view=rev Log: bug3954 missed some styles. Updated English resource, can Gabriel or anyone else do the rest. Modified: trunk/reactos/base/applications/taskmgr/lang/en-US.rc Modified: trunk/reactos/base/applications/taskmgr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/en-US.rc [iso-8859-1] Tue Jun 2 18:58:02 2009 @@ -200,7 +200,7 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "CPU Usage",IDC_CPU_USAGE_FRAME,5,5,60,54,WS_TABSTOP, WS_EX_TRANSPARENT + GROUPBOX "CPU Usage",IDC_CPU_USAGE_FRAME,5,5,60,54,WS_EX_TRANSPARENT GROUPBOX "MEM Usage",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT GROUPBOX "Totals",IDC_TOTALS_FRAME,5,122,111,39,0,WS_EX_TRANSPARENT GROUPBOX "Commit Charge (K)",IDC_COMMIT_CHARGE_FRAME,5,166,111,39,0,WS_EX_TRANSPARENT @@ -216,12 +216,12 @@ EDITTEXT IDC_TOTALS_PROCESS_COUNT,65,149,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "Total",IDS_COMMIT_CHARGE_TOTAL,12,175,27,8 - LTEXT "Limit",IDS_COMMIT_CHARGE_LIMIT,12,184,15,8 + LTEXT "Limit",IDS_COMMIT_CHARGE_LIMIT,12,184,15,8,NOT WS_BORDER LTEXT "Peak",IDS_COMMIT_CHARGE_PEAK,12,193,34,8 EDITTEXT IDC_COMMIT_CHARGE_TOTAL,65,174,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_COMMIT_CHARGE_LIMIT,65,184,45,8,ES_RIGHT | - ES_READONLY | ES_NUMBER | NOT WS_BORDER + ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_COMMIT_CHARGE_PEAK,65,193,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "Total",IDS_PHYSICAL_MEMORY_TOTAL,137,131,27,8 @@ -245,7 +245,7 @@ GROUPBOX "CPU Usage History",IDC_CPU_USAGE_HISTORY_FRAME,74,5,168,54,0,WS_EX_TRANSPARENT GROUPBOX "Memory Usage History",IDC_MEMORY_USAGE_HISTORY_FRAME,74,63,168,54,0,WS_EX_TRANSPARENT PUSHBUTTON "CPU Usage Display",IDC_CPU_USAGE_GRAPH,12,17,47,37,NOT WS_TABSTOP, - WS_EX_CLIENTEDGE + WS_EX_CLIENTEDGE PUSHBUTTON "MEM Usage Display",IDC_MEM_USAGE_GRAPH,12,75,47,37,NOT WS_TABSTOP, WS_EX_CLIENTEDGE PUSHBUTTON "CPU Usage History",IDC_CPU_USAGE_HISTORY_GRAPH,81,17,

1 0

[fireball] 41256: - Properly disable tag validation if using debugging pool (fixes a wrong part of r41255).
by fireball＠svn.reactos.org 02 Jun '09

02 Jun '09

Author: fireball Date: Tue Jun 2 16:54:03 2009 New Revision: 41256 URL: http://svn.reactos.org/svn/reactos?rev=41256&view=rev Log: - Properly disable tag validation if using debugging pool (fixes a wrong part of r41255). Modified: trunk/reactos/ntoskrnl/mm/pool.c Modified: trunk/reactos/ntoskrnl/mm/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pool.c?rev=412… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/pool.c [iso-8859-1] Tue Jun 2 16:54:03 2009 @@ -267,7 +267,7 @@ (char*)Block < ((char*)MmPagedPoolBase + MmPagedPoolSize)) { /* Validate tag */ -#if 0 +#ifndef DEBUG_PPOOL if (Tag != 0 && Tag != EiGetPagedPoolTag(Block)) KeBugCheckEx(BAD_POOL_CALLER, 0x0a, @@ -297,13 +297,14 @@ (char*)Block < ((char*)MiNonPagedPoolStart + MiNonPagedPoolLength)) { /* Validate tag */ - /*if (Tag != 0 && Tag != EiGetNonPagedPoolTag(Block)) +#ifndef DEBUG_NPOOL + if (Tag != 0 && Tag != EiGetNonPagedPoolTag(Block)) KeBugCheckEx(BAD_POOL_CALLER, 0x0a, (ULONG_PTR)Block, EiGetNonPagedPoolTag(Block), - Tag);*/ - + Tag); +#endif /* Validate IRQL */ if (KeGetCurrentIrql() > DISPATCH_LEVEL) KeBugCheckEx(BAD_POOL_CALLER,

1 0

[fireball] 41255: - Add a note about increasing max pool sizes when using pool debugging.
by fireball＠svn.reactos.org 02 Jun '09

02 Jun '09

Author: fireball Date: Tue Jun 2 16:48:00 2009 New Revision: 41255 URL: http://svn.reactos.org/svn/reactos?rev=41255&view=rev Log: - Add a note about increasing max pool sizes when using pool debugging. Modified: trunk/reactos/ntoskrnl/mm/pool.c Modified: trunk/reactos/ntoskrnl/mm/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pool.c?rev=412… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/pool.c [iso-8859-1] Tue Jun 2 16:48:00 2009 @@ -14,7 +14,8 @@ #define NDEBUG #include <debug.h> -/* Uncomment to enable pool overruns debugging */ +/* Uncomment to enable pool overruns debugging. Don't forget to increase + max pool sizes (MM_[NON]PAGED_POOL_SIZE) in include/internal/mm.h */ //#define DEBUG_NPOOL //#define DEBUG_PPOOL @@ -266,13 +267,14 @@ (char*)Block < ((char*)MmPagedPoolBase + MmPagedPoolSize)) { /* Validate tag */ +#if 0 if (Tag != 0 && Tag != EiGetPagedPoolTag(Block)) KeBugCheckEx(BAD_POOL_CALLER, 0x0a, (ULONG_PTR)Block, EiGetPagedPoolTag(Block), Tag); - +#endif /* Validate IRQL */ if (KeGetCurrentIrql() > APC_LEVEL) KeBugCheckEx(BAD_POOL_CALLER, @@ -295,12 +297,12 @@ (char*)Block < ((char*)MiNonPagedPoolStart + MiNonPagedPoolLength)) { /* Validate tag */ - if (Tag != 0 && Tag != EiGetNonPagedPoolTag(Block)) + /*if (Tag != 0 && Tag != EiGetNonPagedPoolTag(Block)) KeBugCheckEx(BAD_POOL_CALLER, 0x0a, (ULONG_PTR)Block, EiGetNonPagedPoolTag(Block), - Tag); + Tag);*/ /* Validate IRQL */ if (KeGetCurrentIrql() > DISPATCH_LEVEL)

1 0

[mjmartin] 41254: IopCreateObjectTypes: Add a DeleteProcedure for Device Objects. IopUnloadDevice: After calling the drivers Unload routine, make the DriverObject temporary and dereference it. IopUnloadDriver: Check that the driver is not already unloading before trying to call unload routine. If any failure, dereference the DriverObject before returning STATUS code. On an attempt to unload the driver, loop through each DeviceObject and set DOE_UNLOAD_PENDING in device extensions flags. Before c
by mjmartin＠svn.reactos.org 02 Jun '09

02 Jun '09

Author: mjmartin Date: Tue Jun 2 16:10:17 2009 New Revision: 41254 URL: http://svn.reactos.org/svn/reactos?rev=41254&view=rev Log: IopCreateObjectTypes: Add a DeleteProcedure for Device Objects. IopUnloadDevice: After calling the drivers Unload routine, make the DriverObject temporary and dereference it. IopUnloadDriver: Check that the driver is not already unloading before trying to call unload routine. If any failure, dereference the DriverObject before returning STATUS code. On an attempt to unload the driver, loop through each DeviceObject and set DOE_UNLOAD_PENDING in device extensions flags. Before calling the driver's unload routine set DRVO_UNLOAD_INVOKED in DriverObject's flags. Fixes Bugchecks when attempting to load driver a second time and when unloading a driver that has upper level device attached. Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/io/iomgr/device.c trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/io/iomgr/iomgr.c Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] Tue Jun 2 16:10:17 2009 @@ -938,6 +938,10 @@ // // File Routines // +VOID +NTAPI +IopDeleteDevice(IN PVOID ObjectBody); + NTSTATUS NTAPI IopParseDevice( Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/device.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] Tue Jun 2 16:10:17 2009 @@ -22,6 +22,21 @@ KSPIN_LOCK ShutdownListLock; /* PRIVATE FUNCTIONS **********************************************************/ + +VOID +NTAPI +IopDeleteDevice(IN PVOID ObjectBody) +{ + PDEVICE_OBJECT DeviceObject = ObjectBody; + PAGED_CODE(); + + /* TODO: Delete Device Node */ + + /* Dereference the driver object, referenced in IoCreateDevice */ + if (DeviceObject->DriverObject); + ObDereferenceObject(DeviceObject->DriverObject); +} + PDEVICE_OBJECT NTAPI @@ -356,6 +371,13 @@ /* Unload it */ if (DriverObject->DriverUnload) DriverObject->DriverUnload(DriverObject); + + /* Make object temporary so it can be deleted */ + ObMakeTemporaryObject(DriverObject); + + /* Dereference once more, referenced at driver object creation */ + ObDereferenceObject(DriverObject); + } VOID Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Tue Jun 2 16:10:17 2009 @@ -977,9 +977,12 @@ UNICODE_STRING ServiceName; UNICODE_STRING ObjectName; PDRIVER_OBJECT DriverObject; + PDEVICE_OBJECT DeviceObject; + PEXTENDED_DEVOBJ_EXTENSION DeviceExtension; LOAD_UNLOAD_PARAMS LoadParams; NTSTATUS Status; LPWSTR Start; + BOOLEAN SafeToUnload = TRUE; DPRINT("IopUnloadDriver('%wZ', %d)\n", DriverServiceName, UnloadPnpDrivers); @@ -1031,6 +1034,14 @@ return Status; } + /* Check that driver is not already unloading */ + if (DriverObject->Flags & DRVO_UNLOAD_INVOKED) + { + DPRINT1("Driver deletion pending\n"); + ObDereferenceObject(DriverObject); + return STATUS_DELETE_PENDING; + } + /* * Get path of service... */ @@ -1049,6 +1060,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("RtlQueryRegistryValues() failed (Status %x)\n", Status); + ObDereferenceObject(DriverObject); return Status; } @@ -1061,6 +1073,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("IopNormalizeImagePath() failed (Status %x)\n", Status); + ObDereferenceObject(DriverObject); return Status; } @@ -1069,6 +1082,35 @@ */ ExFreePool(ImagePath.Buffer); + + /* Loop through each device object of the driver + and set DOE_UNLOAD_PENDING flag */ + DeviceObject = DriverObject->DeviceObject; + while (DeviceObject) + { + /* Set the unload pending flag for the device */ + DeviceExtension = IoGetDevObjExtension(DeviceObject); + DeviceExtension->ExtensionFlags |= DOE_UNLOAD_PENDING; + + /* Make sure there are no attached devices or no reference counts */ + if ((DeviceObject->ReferenceCount) || (DeviceObject->AttachedDevice)) + { + /* Not safe to unload */ + DPRINT1("Drivers device object is referenced or has attached devices\n"); + + SafeToUnload = FALSE; + } + + DeviceObject = DeviceObject->NextDevice; + } + + /* If not safe to unload, then return success */ + if (!SafeToUnload) + { + ObDereferenceObject(DriverObject); + return STATUS_SUCCESS; + } + /* * Unload the module and release the references to the device object @@ -1077,6 +1119,9 @@ /* Call the load/unload routine, depending on current process */ if (DriverObject->DriverUnload && DriverObject->DriverSection) { + /* Set the unload invoked flag */ + DriverObject->Flags |= DRVO_UNLOAD_INVOKED; + if (PsGetCurrentProcess() == PsInitialSystemProcess) { /* Just call right away */ Modified: trunk/reactos/ntoskrnl/io/iomgr/iomgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iomgr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iomgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iomgr.c [iso-8859-1] Tue Jun 2 16:10:17 2009 @@ -265,9 +265,10 @@ NULL, &IoControllerObjectType))) return FALSE; - /* Do the Device Type. FIXME: Needs Delete Routine! */ + /* Do the Device Type */ RtlInitUnicodeString(&Name, L"Device"); ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(DEVICE_OBJECT); + ObjectTypeInitializer.DeleteProcedure = IopDeleteDevice; ObjectTypeInitializer.ParseProcedure = IopParseDevice; ObjectTypeInitializer.SecurityProcedure = IopSecurityFile; if (!NT_SUCCESS(ObCreateObjectType(&Name,

1 0

[mkupfer] 41253: Gabriel Ilardi <gabrielilardi AT hotmail DOT it> - Fixes the TAB_STOP problem for taskmanager. - See issue #3954 for details.
by mkupfer＠svn.reactos.org 02 Jun '09

02 Jun '09

Author: mkupfer Date: Tue Jun 2 15:28:47 2009 New Revision: 41253 URL: http://svn.reactos.org/svn/reactos?rev=41253&view=rev Log: Gabriel Ilardi <gabrielilardi AT hotmail DOT it> - Fixes the TAB_STOP problem for taskmanager. - See issue #3954 for details. Modified: trunk/reactos/base/applications/taskmgr/lang/bg-BG.rc trunk/reactos/base/applications/taskmgr/lang/cs-CZ.rc trunk/reactos/base/applications/taskmgr/lang/da-DK.rc trunk/reactos/base/applications/taskmgr/lang/de-DE.rc trunk/reactos/base/applications/taskmgr/lang/el-GR.rc trunk/reactos/base/applications/taskmgr/lang/en-US.rc trunk/reactos/base/applications/taskmgr/lang/es-ES.rc trunk/reactos/base/applications/taskmgr/lang/fr-FR.rc trunk/reactos/base/applications/taskmgr/lang/hu-HU.rc trunk/reactos/base/applications/taskmgr/lang/id-ID.rc trunk/reactos/base/applications/taskmgr/lang/it-IT.rc trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc trunk/reactos/base/applications/taskmgr/lang/ko-KR.rc trunk/reactos/base/applications/taskmgr/lang/nl-NL.rc trunk/reactos/base/applications/taskmgr/lang/no-NO.rc trunk/reactos/base/applications/taskmgr/lang/pl-PL.rc trunk/reactos/base/applications/taskmgr/lang/pt-BR.rc trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc trunk/reactos/base/applications/taskmgr/lang/sk-SK.rc trunk/reactos/base/applications/taskmgr/lang/sv-SE.rc trunk/reactos/base/applications/taskmgr/lang/uk-UA.rc trunk/reactos/base/applications/taskmgr/lang/zh-CN.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/taskmgr/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/…

1 0

[cgutman] 41213: - Export and hackplement NdisSetTimerEx - Implementation is #ifed out currently but I may enable it later - Hopefully somebody can think of a better way to do it than the current code
by cgutman＠svn.reactos.org 02 Jun '09

02 Jun '09

Author: cgutman Date: Sun May 31 03:07:13 2009 New Revision: 41213 URL: http://svn.reactos.org/svn/reactos?rev=41213&view=rev Log: - Export and hackplement NdisSetTimerEx - Implementation is #ifed out currently but I may enable it later - Hopefully somebody can think of a better way to do it than the current code Modified: trunk/reactos/drivers/network/ndis/ndis.def trunk/reactos/drivers/network/ndis/ndis/time.c Modified: trunk/reactos/drivers/network/ndis/ndis.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis.… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis.def [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis.def [iso-8859-1] Sun May 31 03:07:13 2009 @@ -257,6 +257,7 @@ NdisSetPacketPoolProtocolId@8 ;NdisSetProtocolFilter ? NdisSetTimer@8 +NdisSetTimerEx@12 NdisSetupDmaTransfer@24 NdisSystemProcessorCount@0 NdisTerminateWrapper@8 Modified: trunk/reactos/drivers/network/ndis/ndis/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/time.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/time.c [iso-8859-1] Sun May 31 03:07:13 2009 @@ -243,5 +243,26 @@ KeSetTimer (&Timer->Timer, Timeout, &Timer->Dpc); } +VOID +EXPORT +NdisSetTimerEx( + IN PNDIS_TIMER Timer, + IN UINT MillisecondsToDelay, + IN PVOID FunctionContext) +{ +#if 0 + /* FIXME: I'm not sure how to this in a nice way + * We can't store the function context anywhere in NDIS_TIMER + * so I'm forced to do this + */ + + Timer->Dpc.DeferredContext = FunctionContext; + + NdisSetTimer(Timer, MillisecondsToDelay); +#else + UNIMPLEMENTED +#endif +} + /* EOF */

2 1

[mkupfer] 41252: set menu checkmark always on top always
by mkupfer＠svn.reactos.org 02 Jun '09

02 Jun '09

Author: mkupfer Date: Tue Jun 2 15:04:02 2009 New Revision: 41252 URL: http://svn.reactos.org/svn/reactos?rev=41252&view=rev Log: set menu checkmark always on top always Modified: trunk/reactos/base/applications/taskmgr/taskmgr.c Modified: trunk/reactos/base/applications/taskmgr/taskmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/taskmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/taskmgr.c [iso-8859-1] Tue Jun 2 15:04:02 2009 @@ -267,6 +267,9 @@ if(OnTop) { CheckMenuItem(hPopupMenu, ID_OPTIONS_ALWAYSONTOP, MF_BYCOMMAND | MF_CHECKED); + } else + { + CheckMenuItem(hPopupMenu, ID_OPTIONS_ALWAYSONTOP, MF_BYCOMMAND | MF_UNCHECKED); } SetForegroundWindow(hMainWnd);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs