Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 41211: - Export stubs for NdisQueryBindInstanceName and NdisSetPacketPoolProtocolId
by cgutman＠svn.reactos.org 30 May '09

30 May '09

Author: cgutman Date: Sun May 31 02:50:33 2009 New Revision: 41211 URL: http://svn.reactos.org/svn/reactos?rev=41211&view=rev Log: - Export stubs for NdisQueryBindInstanceName and NdisSetPacketPoolProtocolId Modified: trunk/reactos/drivers/network/ndis/ndis.def trunk/reactos/drivers/network/ndis/ndis/50stubs.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 02:50:33 2009 @@ -226,7 +226,7 @@ NdisPacketSize@4 NdisPciAssignResources@20 NdisQueryAdapterInstanceName@8 -;NdisQueryBindInstanceName? +NdisQueryBindInstanceName@8 NdisQueryBuffer@12 NdisQueryBufferOffset@12 NdisQueryBufferSafe@16 @@ -254,7 +254,7 @@ NdisSendPackets@12 NdisSetEvent@4 NdisSetPacketCancelId@8 -;NdisSetPacketPoolProtocolId ? +NdisSetPacketPoolProtocolId@8 ;NdisSetProtocolFilter ? NdisSetTimer@8 NdisSetupDmaTransfer@24 Modified: trunk/reactos/drivers/network/ndis/ndis/50stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/50stubs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/50stubs.c [iso-8859-1] Sun May 31 02:50:33 2009 @@ -9,6 +9,32 @@ */ #include "ndissys.h" + +/* + * @unimplemented + */ +NDIS_STATUS +EXPORT +NdisQueryBindInstanceName( + OUT PNDIS_STRING pAdapterInstanceName, + IN NDIS_HANDLE BindingContext) +{ + UNIMPLEMENTED + + return NDIS_STATUS_FAILURE; +} + +/* + * @unimplemented + */ +VOID +EXPORT +NdisSetPacketPoolProtocolId( + IN NDIS_HANDLE PacketPoolHandle, + IN UINT ProtocolId) +{ + UNIMPLEMENTED +} /* * @unimplemented

1 0

[cgutman] 41210: - Export NdisGetFirstBufferFromPacketSafe, NdisGetPacketCancelId, NdisGetPoolFromPacket, NdisPacketSize, and NdisSetPacketCancelId
by cgutman＠svn.reactos.org 30 May '09

30 May '09

Author: cgutman Date: Sun May 31 02:18:10 2009 New Revision: 41210 URL: http://svn.reactos.org/svn/reactos?rev=41210&view=rev Log: - Export NdisGetFirstBufferFromPacketSafe, NdisGetPacketCancelId, NdisGetPoolFromPacket, NdisPacketSize, and NdisSetPacketCancelId Modified: trunk/reactos/drivers/network/ndis/ndis.def 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 02:18:10 2009 @@ -100,6 +100,9 @@ NdisGetCurrentSystemTime@4 NdisGetDriverHandle@8 NdisGetFirstBufferFromPacket@20 +NdisGetFirstBufferFromPacketSafe@24 +NdisGetPacketCancelId@4 +NdisGetPoolFromPacket@4 NdisGetReceivedPacket@8 NdisGetSystemUpTime@4 NdisIMAssociateMiniport@8 @@ -220,6 +223,7 @@ NdisOpenProtocolConfiguration@12 ;NdisOverrideBusNumber ? NdisPacketPoolUsage@4 +NdisPacketSize@4 NdisPciAssignResources@20 NdisQueryAdapterInstanceName@8 ;NdisQueryBindInstanceName? @@ -249,6 +253,7 @@ NdisSend@12 NdisSendPackets@12 NdisSetEvent@4 +NdisSetPacketCancelId@8 ;NdisSetPacketPoolProtocolId ? ;NdisSetProtocolFilter ? NdisSetTimer@8

1 0

[cwittich] 41209: -support printing in console (patch by basisbit) and browser view -change console font to Courier New
by cwittich＠svn.reactos.org 30 May '09

30 May '09

Author: cwittich Date: Sun May 31 02:04:07 2009 New Revision: 41209 URL: http://svn.reactos.org/svn/reactos?rev=41209&view=rev Log: -support printing in console (patch by basisbit) and browser view -change console font to Courier New Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.cs trunk/tools/reactosdbg/RosDBG/Dockable Objects/ReactOSWeb.cs trunk/tools/reactosdbg/RosDBG/Dockable Objects/SourceView.Designer.cs trunk/tools/reactosdbg/RosDBG/Dockable Objects/SourceView.resx trunk/tools/reactosdbg/RosDBG/Dockable Objects/ToolWindow.cs trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs trunk/tools/reactosdbg/RosDBG/MainWindow.cs trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs Modified: trunk/tools/reactosdbg/RosDBG/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] Sun May 31 02:04:07 2009 @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.ComponentModel; using System.Drawing; +using System.Drawing.Printing; using System.Data; using System.IO; using System.Linq; @@ -17,12 +18,10 @@ { DebugConnection mConnection; List<string> textToAdd = new List<string>(); - // public event CanCopyChangedEventHandler CanCopyChangedEvent; protected override void OnLoad(EventArgs e) { base.OnLoad(e); - // ((MainWindow)this.ParentForm).CopyEvent += CopyEvent; } public void SetDebugConnection(DebugConnection conn) @@ -55,12 +54,6 @@ } Invoke(Delegate.CreateDelegate(typeof(NoParamsDelegate), this, "UpdateText")); } - - /* void CopyEvent(object sender, CopyEventArgs args) - { - if (args.Obj == this && RawTrafficText.SelectedText != null) - Clipboard.SetText(RawTrafficText.SelectedText); - } */ public RawTraffic() { @@ -95,8 +88,6 @@ private void RawTrafficText_MouseUp(object sender, MouseEventArgs e) { copyToolStripMenuItem.Enabled = (RawTrafficText.SelectionLength > 0); - /* if (CanCopyChangedEvent != null) - CanCopyChangedEvent(this, new CanCopyChangedEventArgs(RawTrafficText.SelectionLength != 0)); */ } private void copyToolStripMenuItem_Click(object sender, EventArgs e) @@ -121,6 +112,7 @@ { case Commands.Save: case Commands.SaveAs: + case Commands.Print: return true; } return false; @@ -145,5 +137,22 @@ } } + public override void Print(bool ShowDialog) + { + PrintDocument printDoc = new PrintDocument(); + printDoc.PrintPage += new PrintPageEventHandler(printDoc_PrintPage); + PrintDialog pd = new PrintDialog(); + pd.Document = printDoc; + if ((!ShowDialog) || (pd.ShowDialog() == DialogResult.OK)) + { + printDoc.Print(); + } + } + + private void printDoc_PrintPage(object sender, PrintPageEventArgs e) + { + e.Graphics.DrawString(RawTrafficText.Text, RawTrafficText.Font, Brushes.Black, 10, 25); + } + } } Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/ReactOSWeb.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Dockable%2… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Dockable Objects/ReactOSWeb.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Dockable Objects/ReactOSWeb.cs [iso-8859-1] Sun May 31 02:04:07 2009 @@ -99,6 +99,7 @@ return pIsCmdEnabled("copy"); case Commands.Save: case Commands.SaveAs: + case Commands.Print: return true; } return false; @@ -137,5 +138,11 @@ return BrowserView.Url.GetComponents(UriComponents.Host, UriFormat.UriEscaped).ToString() + ".html"; } + public override void Print(bool ShowDialog) + { + IHTMLDocument2 htmlDocument = (mshtml.IHTMLDocument2)BrowserView.Document.DomDocument; + htmlDocument.execCommand("print", ShowDialog, null); + } + } } Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/SourceView.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Dockable%2… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Dockable Objects/SourceView.Designer.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Dockable Objects/SourceView.Designer.cs [iso-8859-1] Sun May 31 02:04:07 2009 @@ -100,6 +100,7 @@ // SourceCode // this.SourceCode.Dock = System.Windows.Forms.DockStyle.Fill; + this.SourceCode.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.SourceCode.Location = new System.Drawing.Point(0, 0); this.SourceCode.Name = "SourceCode"; this.SourceCode.ReadOnly = true; Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/SourceView.resx URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Dockable%2… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Dockable Objects/SourceView.resx [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Dockable Objects/SourceView.resx [iso-8859-1] Sun May 31 02:04:07 2009 @@ -139,17 +139,17 @@ <data name="btnBreakpoint.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAlJJREFUOE+10l9I - U1EcB3Bfe/NBCHrqoYcKIxCjPyxpZauocBRYoLT+kIyRlrNbTTfvttu623JztunGNjc3JrkopmCEgcYe - ArVYuXBtWtRWjTnLzVWOVt5vdwaBZGoPHTgPP875fX6H3/kVFPyvNfp4oLjTpqr22NSQiC9sfOTzFa66 - VouK2Od10ug0KZiZCMl0Gak33i4afT02yaoQu1HOzEUp5KsjaYDLQiEbVS3EgdHBXSsiFhP5hZlqZRPo - X0C7EvnYbbkBi04Kl1VfsSxib2tmE/RwmxXAlAGONhkYFnK2K/D1LQWzTjK4LGBQ1i5UdNySgEkYYNFe - xjwLmjUEcjE1lMSZyCLAaZLLHCYF8vtBr+smTQjYRD2srfXIvdOiQyVE7r0GLY3nMRe9DvHpo6HfgFen - W+O2qJB+RbGHFO445JAK+fgR1+JhzyVkIjL479bi82sSPcYaZMJNEFbxgote4LHSSnHVHkyH5JidlMIs - 5yMbo5GaVCI9IUUqLMFMmEA6IkE8IMI5PufJHz3otmqIBSTYgOSzOqReypGZUGI2TOLjeBMSY1eRCFxE - ZOAEqg9v9y/ZRFub7HYe+TAiRHy0Dkk26dN4I6ZfXENsuAbP7x3AQEcZc/Jg6dCSgM/XWnhFwKPyyFj/ - cQx7+UzAd4wJ9h7BU+9ejHg4UIs438Sn9pv/+o3dLWQR20Qyj3jocqbfyGX8jjLcN+2YFwuKvx/avRnE - 2fJ1y84BKeJtaK6rbKiu2NlXsqUou23TWnBL14eqeCX2+kru1hVH+V8u/ATQB2+2DQmylgAAAABJRU5E + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAlJJREFUOE+10l1I + k1EYB3Bvu5MIgq666KKkKMLoA5NWtooKR4EFjtYHyRi5dPZW081329vaR+5LpxubbTombpFMoxAFi10U + ucRy4dy0KK1kTmtzlaOV7793BoFk0y46cC4eznl+z+E5T07O/1qBxz2bb9uVXLddDbHo0sZHPl/uimvV + KYkDXqcK9nqSnhkh6ZYG6o23RYUuj128IsRmIum5cQqZ6ogZ0WqlkBpXLsSDgb49yyJNZvILPWVgElS/ + gEYFMrHLehNWnQStNn1xVqTZVMsk6OGyyIEpIxwmKWgGcjbK8fUtBYtO3JcVMCrKFyo66sWgo0ZYtVcw + z4AWDYH0hBoK4lxkEeA0y6QOsxyZ3d3ZektF8JhEPWyGSqTfadGk5CP9XoO66ouYG78B0dnjod+AV6db + 5bIqkXhFMYcU7jhkkPA5+DGpRa+nAsmIFP675fj8moSnoQzJcA34pezgohe4bSqFqHQfpkMyzI5JYJFx + kJpQIT6mQGJUgnhYjE9hAomIGJODAlzgFDz7owdtNg2xgASrEHsuRHxEhuSoArNhEjPDNYgOXUN08DIi + PafAPbrTv2QT7SZpewb50M/HZECIGJP0cbga0y+vY+JpGV50HEK3uZA+fTj/4ZKAz2fIvcpjUxlk6P5J + PGnn0AMdJ+hg5zEMePej310AtaDgm+jMQctfv7GtjlzDNJHMIC5lEX3PxKL9jkI8MO+ar+DlfT+yNw/E + +aJ1WeeAFLA31ApLqrjFu7u2bVmd2rFpLVj560Ol7O3NlSWsrcuO8r9c+AmDUW+JqfqWTgAAAABJRU5E rkJggg== </value> </data> Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/ToolWindow.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Dockable%2… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Dockable Objects/ToolWindow.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Dockable Objects/ToolWindow.cs [iso-8859-1] Sun May 31 02:04:07 2009 @@ -30,6 +30,11 @@ SaveAs(FileName); } + public virtual void Print(bool ShowDialog) + { + MessageBox.Show("Not implemented!"); + } + public virtual string GetDocumentName() { return ""; 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] Sun May 31 02:04:07 2009 @@ -30,21 +30,21 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainWindow)); - WeifenLuo.WinFormsUI.Docking.DockPanelSkin dockPanelSkin1 = new WeifenLuo.WinFormsUI.Docking.DockPanelSkin(); - WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin autoHideStripSkin1 = new WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin(); - WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient1 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient1 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin dockPaneStripSkin1 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin(); - WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient dockPaneStripGradient1 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient2 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient2 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient3 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient dockPaneStripToolWindowGradient1 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient4 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient5 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient3 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient6 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient7 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.DockPanelSkin dockPanelSkin3 = new WeifenLuo.WinFormsUI.Docking.DockPanelSkin(); + WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin autoHideStripSkin3 = new WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin(); + WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient7 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient15 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin dockPaneStripSkin3 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin(); + WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient dockPaneStripGradient3 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient16 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient8 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient17 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient dockPaneStripToolWindowGradient3 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient18 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient19 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient9 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient20 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient21 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); this.menuStrip = new System.Windows.Forms.MenuStrip(); this.fileMenu = new System.Windows.Forms.ToolStripMenuItem(); this.openToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -138,14 +138,14 @@ this.openToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Black; this.openToolStripMenuItem.Name = "openToolStripMenuItem"; this.openToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); - this.openToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.openToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.openToolStripMenuItem.Text = "&Open"; this.openToolStripMenuItem.Click += new System.EventHandler(this.OpenFile); // // toolStripSeparator3 // this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(145, 6); + this.toolStripSeparator3.Size = new System.Drawing.Size(149, 6); // // saveToolStripMenuItem // @@ -153,21 +153,21 @@ this.saveToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Black; this.saveToolStripMenuItem.Name = "saveToolStripMenuItem"; this.saveToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S))); - this.saveToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.saveToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.saveToolStripMenuItem.Text = "&Save"; this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click); // // saveAsToolStripMenuItem // this.saveAsToolStripMenuItem.Name = "saveAsToolStripMenuItem"; - this.saveAsToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.saveAsToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.saveAsToolStripMenuItem.Text = "Save &as"; this.saveAsToolStripMenuItem.Click += new System.EventHandler(this.SaveAsToolStripMenuItem_Click); // // toolStripSeparator4 // this.toolStripSeparator4.Name = "toolStripSeparator4"; - this.toolStripSeparator4.Size = new System.Drawing.Size(145, 6); + this.toolStripSeparator4.Size = new System.Drawing.Size(149, 6); // // printToolStripMenuItem // @@ -175,25 +175,26 @@ this.printToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Black; this.printToolStripMenuItem.Name = "printToolStripMenuItem"; this.printToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.P))); - this.printToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.printToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.printToolStripMenuItem.Text = "&Print"; + this.printToolStripMenuItem.Click += new System.EventHandler(this.printToolStripMenuItem_Click); // // printSetupToolStripMenuItem // this.printSetupToolStripMenuItem.Enabled = false; this.printSetupToolStripMenuItem.Name = "printSetupToolStripMenuItem"; - this.printSetupToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.printSetupToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.printSetupToolStripMenuItem.Text = "Print setup"; // // toolStripSeparator5 // this.toolStripSeparator5.Name = "toolStripSeparator5"; - this.toolStripSeparator5.Size = new System.Drawing.Size(145, 6); + this.toolStripSeparator5.Size = new System.Drawing.Size(149, 6); // // exitToolStripMenuItem // this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; - this.exitToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.exitToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.exitToolStripMenuItem.Text = "&Exit"; this.exitToolStripMenuItem.Click += new System.EventHandler(this.ExitToolsStripMenuItem_Click); // @@ -461,6 +462,7 @@ this.printToolStripButton.Name = "printToolStripButton"; this.printToolStripButton.Size = new System.Drawing.Size(23, 22); this.printToolStripButton.Text = "Print"; + this.printToolStripButton.Click += new System.EventHandler(this.printToolStripButton_Click); // // toolStripSeparator2 // @@ -530,50 +532,50 @@ this.dockPanel.Location = new System.Drawing.Point(0, 49); this.dockPanel.Name = "dockPanel"; this.dockPanel.Size = new System.Drawing.Size(784, 490); - dockPanelGradient1.EndColor = System.Drawing.SystemColors.ControlLight; - dockPanelGradient1.StartColor = System.Drawing.SystemColors.ControlLight; - autoHideStripSkin1.DockStripGradient = dockPanelGradient1; - tabGradient1.EndColor = System.Drawing.SystemColors.Control; - tabGradient1.StartColor = System.Drawing.SystemColors.Control; - tabGradient1.TextColor = System.Drawing.SystemColors.ControlDarkDark; - autoHideStripSkin1.TabGradient = tabGradient1; - dockPanelSkin1.AutoHideStripSkin = autoHideStripSkin1; - tabGradient2.EndColor = System.Drawing.SystemColors.ControlLightLight; - tabGradient2.StartColor = System.Drawing.SystemColors.ControlLightLight; - tabGradient2.TextColor = System.Drawing.SystemColors.ControlText; - dockPaneStripGradient1.ActiveTabGradient = tabGradient2; - dockPanelGradient2.EndColor = System.Drawing.SystemColors.Control; - dockPanelGradient2.StartColor = System.Drawing.SystemColors.Control; - dockPaneStripGradient1.DockStripGradient = dockPanelGradient2; - tabGradient3.EndColor = System.Drawing.SystemColors.ControlLight; - tabGradient3.StartColor = System.Drawing.SystemColors.ControlLight; - tabGradient3.TextColor = System.Drawing.SystemColors.ControlText; - dockPaneStripGradient1.InactiveTabGradient = tabGradient3; - dockPaneStripSkin1.DocumentGradient = dockPaneStripGradient1; - tabGradient4.EndColor = System.Drawing.SystemColors.ActiveCaption; - tabGradient4.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical; - tabGradient4.StartColor = System.Drawing.SystemColors.GradientActiveCaption; - tabGradient4.TextColor = System.Drawing.SystemColors.ActiveCaptionText; - dockPaneStripToolWindowGradient1.ActiveCaptionGradient = tabGradient4; - tabGradient5.EndColor = System.Drawing.SystemColors.Control; - tabGradient5.StartColor = System.Drawing.SystemColors.Control; - tabGradient5.TextColor = System.Drawing.SystemColors.ControlText; - dockPaneStripToolWindowGradient1.ActiveTabGradient = tabGradient5; - dockPanelGradient3.EndColor = System.Drawing.SystemColors.ControlLight; - dockPanelGradient3.StartColor = System.Drawing.SystemColors.ControlLight; - dockPaneStripToolWindowGradient1.DockStripGradient = dockPanelGradient3; - tabGradient6.EndColor = System.Drawing.SystemColors.GradientInactiveCaption; - tabGradient6.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical; - tabGradient6.StartColor = System.Drawing.SystemColors.GradientInactiveCaption; - tabGradient6.TextColor = System.Drawing.SystemColors.ControlText; - dockPaneStripToolWindowGradient1.InactiveCaptionGradient = tabGradient6; - tabGradient7.EndColor = System.Drawing.Color.Transparent; - tabGradient7.StartColor = System.Drawing.Color.Transparent; - tabGradient7.TextColor = System.Drawing.SystemColors.ControlDarkDark; - dockPaneStripToolWindowGradient1.InactiveTabGradient = tabGradient7; - dockPaneStripSkin1.ToolWindowGradient = dockPaneStripToolWindowGradient1; - dockPanelSkin1.DockPaneStripSkin = dockPaneStripSkin1; - this.dockPanel.Skin = dockPanelSkin1; + dockPanelGradient7.EndColor = System.Drawing.SystemColors.ControlLight; + dockPanelGradient7.StartColor = System.Drawing.SystemColors.ControlLight; + autoHideStripSkin3.DockStripGradient = dockPanelGradient7; + tabGradient15.EndColor = System.Drawing.SystemColors.Control; + tabGradient15.StartColor = System.Drawing.SystemColors.Control; + tabGradient15.TextColor = System.Drawing.SystemColors.ControlDarkDark; + autoHideStripSkin3.TabGradient = tabGradient15; + dockPanelSkin3.AutoHideStripSkin = autoHideStripSkin3; + tabGradient16.EndColor = System.Drawing.SystemColors.ControlLightLight; + tabGradient16.StartColor = System.Drawing.SystemColors.ControlLightLight; + tabGradient16.TextColor = System.Drawing.SystemColors.ControlText; + dockPaneStripGradient3.ActiveTabGradient = tabGradient16; + dockPanelGradient8.EndColor = System.Drawing.SystemColors.Control; + dockPanelGradient8.StartColor = System.Drawing.SystemColors.Control; + dockPaneStripGradient3.DockStripGradient = dockPanelGradient8; + tabGradient17.EndColor = System.Drawing.SystemColors.ControlLight; + tabGradient17.StartColor = System.Drawing.SystemColors.ControlLight; + tabGradient17.TextColor = System.Drawing.SystemColors.ControlText; + dockPaneStripGradient3.InactiveTabGradient = tabGradient17; + dockPaneStripSkin3.DocumentGradient = dockPaneStripGradient3; + tabGradient18.EndColor = System.Drawing.SystemColors.ActiveCaption; + tabGradient18.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical; + tabGradient18.StartColor = System.Drawing.SystemColors.GradientActiveCaption; + tabGradient18.TextColor = System.Drawing.SystemColors.ActiveCaptionText; + dockPaneStripToolWindowGradient3.ActiveCaptionGradient = tabGradient18; + tabGradient19.EndColor = System.Drawing.SystemColors.Control; + tabGradient19.StartColor = System.Drawing.SystemColors.Control; + tabGradient19.TextColor = System.Drawing.SystemColors.ControlText; + dockPaneStripToolWindowGradient3.ActiveTabGradient = tabGradient19; + dockPanelGradient9.EndColor = System.Drawing.SystemColors.ControlLight; + dockPanelGradient9.StartColor = System.Drawing.SystemColors.ControlLight; + dockPaneStripToolWindowGradient3.DockStripGradient = dockPanelGradient9; + tabGradient20.EndColor = System.Drawing.SystemColors.GradientInactiveCaption; + tabGradient20.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical; + tabGradient20.StartColor = System.Drawing.SystemColors.GradientInactiveCaption; + tabGradient20.TextColor = System.Drawing.SystemColors.ControlText; + dockPaneStripToolWindowGradient3.InactiveCaptionGradient = tabGradient20; + tabGradient21.EndColor = System.Drawing.Color.Transparent; + tabGradient21.StartColor = System.Drawing.Color.Transparent; + tabGradient21.TextColor = System.Drawing.SystemColors.ControlDarkDark; + dockPaneStripToolWindowGradient3.InactiveTabGradient = tabGradient21; + dockPaneStripSkin3.ToolWindowGradient = dockPaneStripToolWindowGradient3; + dockPanelSkin3.DockPaneStripSkin = dockPaneStripSkin3; + this.dockPanel.Skin = dockPanelSkin3; this.dockPanel.TabIndex = 4; this.dockPanel.ActiveDocumentChanged += new System.EventHandler(this.dockPanel_ActiveDocumentChanged); // 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] Sun May 31 02:04:07 2009 @@ -374,6 +374,16 @@ } } + private void printToolStripMenuItem_Click(object sender, EventArgs e) + { + ((ToolWindow)dockPanel.ActiveDocument.DockHandler.Form).Print(true); + } + + private void printToolStripButton_Click(object sender, EventArgs e) + { + ((ToolWindow)dockPanel.ActiveDocument.DockHandler.Form).Print(false); + } + } } Modified: trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Properties… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs [iso-8859-1] Sun May 31 02:04:07 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.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("1.0.0.2")] +[assembly: AssemblyFileVersion("1.0.0.2")]

1 0

[spetreolle] 41208: Export NdisCopyFromPacketToPacketSafe
by spetreolle＠svn.reactos.org 30 May '09

30 May '09

Author: spetreolle Date: Sun May 31 01:50:49 2009 New Revision: 41208 URL: http://svn.reactos.org/svn/reactos?rev=41208&view=rev Log: Export NdisCopyFromPacketToPacketSafe Modified: trunk/reactos/drivers/network/ndis/ndis.def 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 01:50:49 2009 @@ -74,6 +74,7 @@ NdisConvertStringToAtmAddress@12 NdisCopyBuffer@24 NdisCopyFromPacketToPacket@24 +NdisCopyFromPacketToPacketSafe@28 NdisDeregisterAdapter@4 NdisDeregisterAdapterShutdownHandler@4 NdisDeregisterMac@8

1 0

[cgutman] 41207: - Fix handling of nonpaged contiguous memory in NdisAllocateMemory and NdisFreeMemory
by cgutman＠svn.reactos.org 30 May '09

30 May '09

Author: cgutman Date: Sat May 30 21:12:45 2009 New Revision: 41207 URL: http://svn.reactos.org/svn/reactos?rev=41207&view=rev Log: - Fix handling of nonpaged contiguous memory in NdisAllocateMemory and NdisFreeMemory Modified: trunk/reactos/drivers/network/ndis/ndis/memory.c Modified: trunk/reactos/drivers/network/ndis/ndis/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/memory.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/memory.c [iso-8859-1] Sat May 30 21:12:45 2009 @@ -74,26 +74,26 @@ { NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); - if (MemoryFlags & NDIS_MEMORY_NONCACHED) - { + if (MemoryFlags & NDIS_MEMORY_CONTIGUOUS) + { + /* Allocate contiguous memory (possibly noncached) */ + *VirtualAddress = MmAllocateContiguousMemorySpecifyCache(Length, + RtlConvertUlongToLargeInteger(0), + HighestAcceptableAddress, + RtlConvertUlongToLargeInteger(0), + (MemoryFlags & NDIS_MEMORY_NONCACHED) ? MmNonCached : MmCached); + } + else if (MemoryFlags & NDIS_MEMORY_NONCACHED) + { + /* Allocate noncached noncontiguous memory */ *VirtualAddress = MmAllocateNonCachedMemory(Length); - if(!*VirtualAddress) - return NDIS_STATUS_FAILURE; - - return NDIS_STATUS_SUCCESS; - } - - if (MemoryFlags & NDIS_MEMORY_CONTIGUOUS) - { - *VirtualAddress = MmAllocateContiguousMemory(Length, HighestAcceptableAddress); - if(!*VirtualAddress) - return NDIS_STATUS_FAILURE; - - return NDIS_STATUS_SUCCESS; - } - - /* Plain nonpaged memory */ - *VirtualAddress = ExAllocatePool(NonPagedPool, Length); + } + else + { + /* Allocate plain nonpaged memory */ + *VirtualAddress = ExAllocatePool(NonPagedPool, Length); + } + if (!*VirtualAddress) return NDIS_STATUS_FAILURE; @@ -120,19 +120,23 @@ { NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); - if (MemoryFlags & NDIS_MEMORY_NONCACHED) - { + if (MemoryFlags & NDIS_MEMORY_CONTIGUOUS) + { + /* Free contiguous memory (possibly noncached) */ + MmFreeContiguousMemorySpecifyCache(VirtualAddress, + Length, + (MemoryFlags & NDIS_MEMORY_NONCACHED) ? MmNonCached : MmCached); + } + else if (MemoryFlags & NDIS_MEMORY_NONCACHED) + { + /* Free noncached noncontiguous memory */ MmFreeNonCachedMemory(VirtualAddress, Length); - return; - } - - if (MemoryFlags & NDIS_MEMORY_CONTIGUOUS) - { - MmFreeContiguousMemory(VirtualAddress); - return; - } - - ExFreePool(VirtualAddress); + } + else + { + /* Free nonpaged pool */ + ExFreePool(VirtualAddress); + } }

1 0

[dchapyshev] 41206: - Set default kb layout for Russian language to English
by dchapyshev＠svn.reactos.org 30 May '09

30 May '09

Author: dchapyshev Date: Sat May 30 17:47:48 2009 New Revision: 41206 URL: http://svn.reactos.org/svn/reactos?rev=41206&view=rev Log: - Set default kb layout for Russian language to English Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h trunk/reactos/media/inf/intl.inf Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ru-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] Sat May 30 17:47:48 2009 @@ -3,8 +3,8 @@ MUI_LAYOUTS ruRULayouts[] = { + { L"0409", L"00000409" }, { L"0419", L"00000419" }, - { L"0409", L"00000409" }, { NULL, NULL } }; Modified: trunk/reactos/media/inf/intl.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/intl.inf?rev=412… ============================================================================== Binary files - no diff available.

1 0

[spetreolle] 41205: Implement CDS_TEST flag for IntChangeDisplaySettings. Set ERROR_CALL_NOT_IMPLEMENTED where needed.
by spetreolle＠svn.reactos.org 30 May '09

30 May '09

Author: spetreolle Date: Sat May 30 16:26:59 2009 New Revision: 41205 URL: http://svn.reactos.org/svn/reactos?rev=41205&view=rev Log: Implement CDS_TEST flag for IntChangeDisplaySettings. Set ERROR_CALL_NOT_IMPLEMENTED where needed. Modified: trunk/reactos/subsystems/win32/win32k/objects/device.c Modified: trunk/reactos/subsystems/win32/win32k/objects/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/device.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/device.c [iso-8859-1] Sat May 30 16:26:59 2009 @@ -1202,7 +1202,7 @@ BOOLEAN NoReset = FALSE; BOOLEAN Reset = FALSE; BOOLEAN SetPrimary = FALSE; - LONG Ret=0; + LONG Ret = DISP_CHANGE_SUCCESSFUL; NTSTATUS Status ; DPRINT1("display flags : %x\n",dwflags); @@ -1230,14 +1230,17 @@ /* Dynamically change graphics mode */ DPRINT1("flag 0 UNIMPLEMENTED\n"); return DISP_CHANGE_FAILED; + SetLastWin32Error(ERROR_CALL_NOT_IMPLEMENTED); } if ((dwflags & CDS_TEST) == CDS_TEST) { - /* Test reslution */ + /* Test resolution */ dwflags &= ~CDS_TEST; - DPRINT1("flag CDS_TEST UNIMPLEMENTED\n"); - Ret = DISP_CHANGE_FAILED; + Status = IntEnumDisplaySettings(pDeviceName, ENUM_REGISTRY_SETTINGS, DevMode, 0); + if (!NT_SUCCESS(Status)) + Ret = DISP_CHANGE_BADMODE; + return Ret; } if ((dwflags & CDS_FULLSCREEN) == CDS_FULLSCREEN) @@ -1274,6 +1277,7 @@ { DPRINT1("flag CDS_VIDEOPARAMETERS UNIMPLEMENTED\n"); Ret = DISP_CHANGE_FAILED; + SetLastWin32Error(ERROR_CALL_NOT_IMPLEMENTED); } } @@ -1387,6 +1391,7 @@ if (dwflags != 0) Ret = DISP_CHANGE_BADFLAGS; + DPRINT("IntChangeDisplaySettings returning %x\n", Ret); return Ret; }

1 0

[spetreolle] 41204: ChangeDisplaySettingsA and ChangeDisplaySettingsW should reset dmDriverExtra to 0.
by spetreolle＠svn.reactos.org 30 May '09

30 May '09

Author: spetreolle Date: Sat May 30 16:23:20 2009 New Revision: 41204 URL: http://svn.reactos.org/svn/reactos?rev=41204&view=rev Log: ChangeDisplaySettingsA and ChangeDisplaySettingsW should reset dmDriverExtra to 0. Modified: trunk/reactos/dll/win32/user32/misc/display.c Modified: trunk/reactos/dll/win32/user32/misc/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/disp… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/display.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/display.c [iso-8859-1] Sat May 30 16:23:20 2009 @@ -493,7 +493,10 @@ LPDEVMODEA lpDevMode, DWORD dwflags) { - return ChangeDisplaySettingsExA ( NULL, lpDevMode, NULL, dwflags, 0 ); + LONG Status = ChangeDisplaySettingsExA ( NULL, lpDevMode, NULL, dwflags, 0 ); + if(lpDevMode) + lpDevMode->dmDriverExtra = 0; + return Status; } @@ -533,5 +536,8 @@ LPDEVMODEW lpDevMode, DWORD dwflags) { - return ChangeDisplaySettingsExW ( NULL, lpDevMode, NULL, dwflags, 0 ); -} + LONG Status = ChangeDisplaySettingsExW ( NULL, lpDevMode, NULL, dwflags, 0 ); + if(lpDevMode) + lpDevMode->dmDriverExtra = 0; + return Status; +}

1 0

[fireball] 41203: - Add missing parameters probing.
by fireball＠svn.reactos.org 30 May '09

30 May '09

Author: fireball Date: Sat May 30 14:57:31 2009 New Revision: 41203 URL: http://svn.reactos.org/svn/reactos?rev=41203&view=rev Log: - Add missing parameters probing. Modified: trunk/reactos/ntoskrnl/mm/anonmem.c Modified: trunk/reactos/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/anonmem.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] Sat May 30 14:57:31 2009 @@ -949,12 +949,14 @@ */ { MEMORY_AREA* MemoryArea; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; PEPROCESS Process; PMMSUPPORT AddressSpace; PVOID BaseAddress; ULONG RegionSize; + PAGED_CODE(); + DPRINT("NtFreeVirtualMemory(ProcessHandle %x, *PBaseAddress %x, " "*PRegionSize %x, FreeType %x)\n",ProcessHandle,*PBaseAddress, *PRegionSize,FreeType); @@ -963,6 +965,23 @@ { DPRINT1("Invalid FreeType\n"); return STATUS_INVALID_PARAMETER_4; + } + + if(ExGetPreviousMode() != KernelMode) + { + _SEH2_TRY + { + /* Probe user pointers */ + ProbeForWriteSize_t(PRegionSize); + ProbeForWritePointer(PBaseAddress); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Get exception code */ + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + if (!NT_SUCCESS(Status)) return Status; } BaseAddress = (PVOID)PAGE_ROUND_DOWN((*PBaseAddress));

1 0

[mjmartin] 41202: - eventlog.h: Add LIST_ENTRY to EVENTSOURCE structure to track handles. - ElfCreateEventLogHandle: Modify return type to PEVENTSOURCE and add BOOL parameter to determine whether handle is being created or opened as behavior differs between the two. - Added ElfGetEventLogSourceEntryByHandle for looking up the handle. - Implement EventLog api's ElfrOpenELW, ElfrRegisterEventSourceW, ElfrReadELW, ElfrReportEventW, ElfrOldestRecord, ElfrCloseEL and ElfrDeregisterEventSource. - Logf
by mjmartin＠svn.reactos.org 30 May '09

30 May '09

Author: mjmartin Date: Sat May 30 05:08:56 2009 New Revision: 41202 URL: http://svn.reactos.org/svn/reactos?rev=41202&view=rev Log: - eventlog.h: Add LIST_ENTRY to EVENTSOURCE structure to track handles. - ElfCreateEventLogHandle: Modify return type to PEVENTSOURCE and add BOOL parameter to determine whether handle is being created or opened as behavior differs between the two. - Added ElfGetEventLogSourceEntryByHandle for looking up the handle. - Implement EventLog api's ElfrOpenELW, ElfrRegisterEventSourceW, ElfrReadELW, ElfrReportEventW, ElfrOldestRecord, ElfrCloseEL and ElfrDeregisterEventSource. - LogfWriteData: Remove unnecessary debugging. Modified: trunk/reactos/base/services/eventlog/eventlog.h trunk/reactos/base/services/eventlog/file.c trunk/reactos/base/services/eventlog/rpc.c Modified: trunk/reactos/base/services/eventlog/eventlog.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/eve… ============================================================================== --- trunk/reactos/base/services/eventlog/eventlog.h [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/eventlog.h [iso-8859-1] Sat May 30 05:08:56 2009 @@ -91,11 +91,12 @@ LIST_ENTRY ListEntry; } LOGFILE, *PLOGFILE; -typedef struct +typedef struct _EVENTSOURCE { + LIST_ENTRY EventSourceListEntry; PLOGFILE LogFile; ULONG CurrentRecord; - WCHAR *Name; + WCHAR szName[1]; } EVENTSOURCE, *PEVENTSOURCE; /* file.c */ Modified: trunk/reactos/base/services/eventlog/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/fil… ============================================================================== --- trunk/reactos/base/services/eventlog/file.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/file.c [iso-8859-1] Sat May 30 05:08:56 2009 @@ -716,7 +716,7 @@ /* Determine how many records need to be overwritten */ while (TRUE) { - DPRINT1("EventLogFile has reached maximume size\n"); + DPRINT("EventLogFile has reached maximume size\n"); if (!RecBuf) { @@ -762,13 +762,9 @@ /* Check the size of the record as the record adding may be larger */ if (OverWriteLength >= BufSize) { - DPRINT1("Record will fit. Lenght %d, BufSize %d\n", OverWriteLength, BufSize); + DPRINT("Record will fit. Lenght %d, BufSize %d\n", OverWriteLength, BufSize); LogFile->Header.StartOffset = LogfOffsetByNumber(LogFile, LogFile->Header.OldestRecordNumber); break; - } - else - { - DPRINT1("Record wont fit\n"); } } HeapFree(GetProcessHeap(), 0, RecBuf); Modified: trunk/reactos/base/services/eventlog/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/rpc… ============================================================================== --- trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] Sat May 30 05:08:56 2009 @@ -4,17 +4,22 @@ * FILE: services/eventlog/rpc.c * PURPOSE: Event logging service * COPYRIGHT: Copyright 2005 Saveliy Tretiakov + * Copyright 2008 Michael Martin */ /* INCLUDES *****************************************************************/ #include "eventlog.h" +LIST_ENTRY EventSourceListHead; + /* FUNCTIONS ****************************************************************/ DWORD WINAPI RpcThreadRoutine(LPVOID lpParameter) { RPC_STATUS Status; + + InitializeListHead(&EventSourceListHead); Status = RpcServerUseProtseqEpW(L"ncacn_np", 20, L"\\pipe\\EventLog", NULL); if (Status != RPC_S_OK) @@ -41,31 +46,21 @@ return 0; } -IELF_HANDLE ElfCreateEventLogHandle(WCHAR *Name) -{ - PEVENTSOURCE EventSourceHandle; +PEVENTSOURCE ElfCreateEventLogHandle(LPCWSTR Name, BOOL Create) +{ + PEVENTSOURCE lpEventSource; PLOGFILE currentLogFile = NULL; - HKEY hLogSourceNameKey = NULL; - WCHAR *SourceNameRegKey = NULL; - DWORD dwError, dwSize; INT i, LogsActive; - EventSourceHandle = HeapAlloc(GetProcessHeap(), 0, sizeof(EVENTSOURCE)); - if (!EventSourceHandle) + lpEventSource = HeapAlloc(GetProcessHeap(), 0, sizeof(EVENTSOURCE) + + ((wcslen(Name) + 1) * sizeof(WCHAR))); + if (!lpEventSource) { DPRINT1("Failed to allocate Heap!\n"); return NULL; } - EventSourceHandle->Name = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY ,(wcslen(Name) + 1) * sizeof(WCHAR)); - if (!EventSourceHandle->Name) - { - HeapFree(GetProcessHeap(),0, EventSourceHandle); - DPRINT1("Failed to allocate Heap!\n"); - return NULL; - } - - wcscpy(EventSourceHandle->Name, Name); + wcscpy(lpEventSource->szName, Name); /* Get the number of Log Files the EventLog service found */ LogsActive = LogfListItemCount(); @@ -75,65 +70,62 @@ goto Cleanup; } - /* Default to the Application Log, as documented on MSDN */ - EventSourceHandle->LogFile = LogfListItemByName(L"Application"); + /* If Creating, default to the Application Log in case we fail, as documented on MSDN */ + if (Create == TRUE) + lpEventSource->LogFile = LogfListItemByName(L"Application"); + else + lpEventSource->LogFile = NULL; for (i = 1; i <= LogsActive; i++) { currentLogFile = LogfListItemByIndex(i); - //DPRINT1("LogFile = %S\n",currentLogFile->LogName); - - dwSize = 90; - dwSize += (wcslen(currentLogFile->LogName) + 3) * sizeof(WCHAR); - dwSize += (wcslen(Name) + 1) * sizeof(WCHAR); - - SourceNameRegKey = HeapAlloc(GetProcessHeap(), 0, dwSize); - - wcscpy(SourceNameRegKey, L"SYSTEM\\CurrentControlSet\\Services\\EventLog\\"); - wcsncat(SourceNameRegKey, currentLogFile->LogName, wcslen(currentLogFile->LogName)); - wcsncat(SourceNameRegKey, L"\\",2); - wcsncat(SourceNameRegKey, Name, wcslen(Name)); - - dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, - SourceNameRegKey, - 0, - KEY_READ, - &hLogSourceNameKey); - - HeapFree(GetProcessHeap(), 0, SourceNameRegKey); - - if (dwError == ERROR_SUCCESS) + + if (_wcsicmp(Name, currentLogFile->LogName) == 0) { - EventSourceHandle->LogFile = currentLogFile; + lpEventSource->LogFile = LogfListItemByIndex(i); + lpEventSource->CurrentRecord = LogfGetOldestRecord(lpEventSource->LogFile); break; } } - /* If hLogSourceRegKey is NULL */ - if (!hLogSourceNameKey) - { - DPRINT1("Could not find subkey %S under any of the eventlog logfiles in registry. Using default of Application.\n",Name); - } - - if (hLogSourceNameKey) RegCloseKey(hLogSourceNameKey); - - return EventSourceHandle; + if (!lpEventSource->LogFile) + goto Cleanup; + + /* Append service record */ + InsertTailList(&EventSourceListHead, &lpEventSource->EventSourceListEntry); + + return lpEventSource; Cleanup: - HeapFree(GetProcessHeap(), 0, EventSourceHandle->Name); - HeapFree(GetProcessHeap(), 0, EventSourceHandle); + HeapFree(GetProcessHeap(), 0, lpEventSource); + return NULL; } +PEVENTSOURCE ElfGetEventLogSourceEntryByHandle(IELF_HANDLE EventLogHandle) +{ + PEVENTSOURCE CurrentEventSource; + + if (IsListEmpty(&EventSourceListHead)) + { + return NULL; + } + CurrentEventSource = CONTAINING_RECORD((PEVENTSOURCE)EventLogHandle, EVENTSOURCE, EventSourceListEntry); + + return CurrentEventSource; +} + BOOL ElfDeleteEventLogHandle(IELF_HANDLE EventLogHandle) { - PEVENTSOURCE pHandle = (PEVENTSOURCE) EventLogHandle; - - if (pHandle->LogFile->Header.Signature != LOGFILE_SIGNATURE) + PEVENTSOURCE lpEventSource = (PEVENTSOURCE)EventLogHandle; + if (!ElfGetEventLogSourceEntryByHandle(lpEventSource)) + { return FALSE; - - HeapFree(GetProcessHeap(),0,pHandle->Name); - HeapFree(GetProcessHeap(),0,pHandle); + } + + RemoveEntryList(&lpEventSource->EventSourceListEntry); + HeapFree(GetProcessHeap(),0,lpEventSource); + return TRUE; } @@ -156,13 +148,16 @@ return STATUS_NOT_IMPLEMENTED; } - /* Function 2 */ NTSTATUS ElfrCloseEL( IELF_HANDLE *LogHandle) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + if (!ElfDeleteEventLogHandle(*LogHandle)) + { + return STATUS_INVALID_HANDLE; + } + + return STATUS_SUCCESS; } @@ -170,7 +165,11 @@ NTSTATUS ElfrDeregisterEventSource( IELF_HANDLE *LogHandle) { - UNIMPLEMENTED; + if (!ElfDeleteEventLogHandle(*LogHandle)) + { + return STATUS_INVALID_HANDLE; + } + return STATUS_SUCCESS; } @@ -180,8 +179,17 @@ IELF_HANDLE LogHandle, DWORD *NumberOfRecords) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PEVENTSOURCE lpEventSource; + + lpEventSource = ElfGetEventLogSourceEntryByHandle(LogHandle); + if (!lpEventSource) + { + return STATUS_INVALID_HANDLE; + } + + *NumberOfRecords = lpEventSource->LogFile->Header.CurrentRecordNumber; + + return STATUS_SUCCESS; } @@ -190,8 +198,22 @@ IELF_HANDLE LogHandle, DWORD *OldestRecordNumber) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PEVENTSOURCE lpEventSource; + + lpEventSource = ElfGetEventLogSourceEntryByHandle(LogHandle); + if (!lpEventSource) + { + return STATUS_INVALID_HANDLE; + } + + if (!OldestRecordNumber) + { + return STATUS_INVALID_PARAMETER; + } + + *OldestRecordNumber = 0; + *OldestRecordNumber = LogfGetOldestRecord(lpEventSource->LogFile); + return STATUS_SUCCESS; } @@ -215,8 +237,24 @@ DWORD MinorVersion, IELF_HANDLE *LogHandle) { - UNIMPLEMENTED; - *LogHandle = (IELF_HANDLE)1; + if ((MajorVersion != 1) || (MinorVersion != 1)) + return STATUS_INVALID_PARAMETER; + + /* RegModuleName must be an empty string */ + if (RegModuleName->Length > 0) + return STATUS_INVALID_PARAMETER; + + /*FIXME: UNCServerName must specify the server */ + + /*FIXME: Must verify that caller has read access */ + + *LogHandle = ElfCreateEventLogHandle(ModuleName->Buffer, FALSE); + + if (*LogHandle == NULL) + { + return STATUS_INVALID_PARAMETER; + } + return STATUS_SUCCESS; } @@ -230,8 +268,19 @@ DWORD MinorVersion, IELF_HANDLE *LogHandle) { - UNIMPLEMENTED; - *LogHandle = (IELF_HANDLE)1; + if ((MajorVersion != 1) || (MinorVersion != 1)) + return STATUS_INVALID_PARAMETER; + + /* RegModuleName must be an empty string */ + if (RegModuleName->Length > 0) + return STATUS_INVALID_PARAMETER; + + /*FIXME: UNCServerName must specify the server or empty for local */ + + /*FIXME: Must verify that caller has write access */ + + *LogHandle = ElfCreateEventLogHandle(ModuleName->Buffer, TRUE); + return STATUS_SUCCESS; } @@ -259,8 +308,39 @@ DWORD *NumberOfBytesRead, DWORD *MinNumberOfBytesNeeded) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PEVENTSOURCE lpEventSource; + DWORD dwError; + DWORD RecordNumber; + + lpEventSource = ElfGetEventLogSourceEntryByHandle(LogHandle); + if (!lpEventSource) + { + return STATUS_INVALID_HANDLE; + } + + if (!Buffer) + return I_RpcMapWin32Status(ERROR_INVALID_PARAMETER); + + /* If sequential read, retrieve the CurrentRecord from this log handle */ + if (ReadFlags & EVENTLOG_SEQUENTIAL_READ) + { + RecordNumber = lpEventSource->CurrentRecord; + } + else + { + RecordNumber = RecordOffset; + } + + dwError = LogfReadEvent(lpEventSource->LogFile, ReadFlags, &RecordNumber, + NumberOfBytesToRead, Buffer, NumberOfBytesRead, MinNumberOfBytesNeeded); + + /* Update the handles CurrentRecord if success*/ + if (dwError == ERROR_SUCCESS) + { + lpEventSource->CurrentRecord = RecordNumber; + } + + return I_RpcMapWin32Status(dwError); } @@ -282,8 +362,28 @@ DWORD *TimeWritten) { USHORT i; - - /* partial stub */ + PBYTE LogBuffer; + PEVENTSOURCE lpEventSource; + DWORD lastRec; + DWORD recSize; + DWORD dwStringsSize = 0; + DWORD dwError = ERROR_SUCCESS; + WCHAR *lpStrings; + + lpEventSource = ElfGetEventLogSourceEntryByHandle(LogHandle); + if (!lpEventSource) + { + return STATUS_INVALID_HANDLE; + } + + /* Flags must be 0 */ + if (Flags) + { + return STATUS_INVALID_PARAMETER; + } + + lastRec = LogfGetCurrentRecord(lpEventSource->LogFile); + for (i = 0; i < NumStrings; i++) { switch (EventType) @@ -308,9 +408,48 @@ DPRINT1("Type %hu: %wZ\n", EventType, Strings[i]); break; } - } - - return STATUS_SUCCESS; + dwStringsSize += (wcslen(Strings[i]->Buffer) + 1) * sizeof(WCHAR); + } + + lpStrings = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY, dwStringsSize * 2); + if (!lpStrings) + { + DPRINT1("Failed to allocate heap\n"); + return STATUS_NO_MEMORY; + } + + int pos = 0; + for (i = 0; i < NumStrings; i++) + { + wcscpy((WCHAR*)(lpStrings + pos), Strings[i]->Buffer); + pos += (wcslen(Strings[i]->Buffer) + 1) * sizeof(WCHAR); + } + + LogBuffer = LogfAllocAndBuildNewRecord(&recSize, + lastRec, + EventType, + EventCategory, + EventID, + lpEventSource->szName, + ComputerName->Buffer, + sizeof(UserSID), + &UserSID, + NumStrings, + (WCHAR*)lpStrings, + DataSize, + Data); + + dwError = LogfWriteData(lpEventSource->LogFile, recSize, LogBuffer); + if (!dwError) + { + DPRINT1("ERROR WRITING TO EventLog %S\n",lpEventSource->LogFile->FileName); + } + + LogfFreeRecord(LogBuffer); + + HeapFree(GetProcessHeap(), 0, lpStrings); + + return I_RpcMapWin32Status(dwError); }

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