Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 22458: Next small bugfix
by greatlrd＠svn.reactos.org 21 Jun '06

21 Jun '06

Author: greatlrd Date: Wed Jun 21 16:55:11 2006 New Revision: 22458 URL: http://svn.reactos.ru/svn/reactos?rev=22458&view=rev Log: Next small bugfix Modified: trunk/tools/Qemu GUI/bin/Release/Qemu GUI.exe trunk/tools/Qemu GUI/frmMain.cs Modified: trunk/tools/Qemu GUI/bin/Release/Qemu GUI.exe URL: http://svn.reactos.ru/svn/reactos/trunk/tools/Qemu%20GUI/bin/Release/Qemu%2… ============================================================================== Binary files - no diff available. Modified: trunk/tools/Qemu GUI/frmMain.cs URL: http://svn.reactos.ru/svn/reactos/trunk/tools/Qemu%20GUI/frmMain.cs?rev=224… ============================================================================== --- trunk/tools/Qemu GUI/frmMain.cs (original) +++ trunk/tools/Qemu GUI/frmMain.cs Wed Jun 21 16:55:11 2006 @@ -585,6 +585,7 @@ // // txtCDROM // + this.txtCDROM.Enabled = false; this.txtCDROM.Location = new System.Drawing.Point(61, 134); this.txtCDROM.Name = "txtCDROM"; this.txtCDROM.Size = new System.Drawing.Size(338, 20); @@ -1609,12 +1610,14 @@ { cboCDROM.Enabled = !optCDImage.Checked; btnBrowseCDROM.Enabled = optCDImage.Checked; + txtCDROM.Enabled = false; } private void optCDImage_CheckedChanged(object sender, System.EventArgs e) { cboCDROM.Enabled = !optCDImage.Checked; btnBrowseCDROM.Enabled = optCDImage.Checked; + txtCDROM.Enabled = true; } #endregion

1 0

[greatlrd] 22457: fixing small bugs in the new GUI design
by greatlrd＠svn.reactos.org 21 Jun '06

21 Jun '06

Author: greatlrd Date: Wed Jun 21 16:48:46 2006 New Revision: 22457 URL: http://svn.reactos.ru/svn/reactos?rev=22457&view=rev Log: fixing small bugs in the new GUI design Modified: trunk/tools/Qemu GUI/bin/Release/Qemu GUI.exe trunk/tools/Qemu GUI/frmMain.cs Modified: trunk/tools/Qemu GUI/bin/Release/Qemu GUI.exe URL: http://svn.reactos.ru/svn/reactos/trunk/tools/Qemu%20GUI/bin/Release/Qemu%2… ============================================================================== Binary files - no diff available. Modified: trunk/tools/Qemu GUI/frmMain.cs URL: http://svn.reactos.ru/svn/reactos/trunk/tools/Qemu%20GUI/frmMain.cs?rev=224… ============================================================================== --- trunk/tools/Qemu GUI/frmMain.cs (original) +++ trunk/tools/Qemu GUI/frmMain.cs Wed Jun 21 16:48:46 2006 @@ -509,6 +509,8 @@ // chkSetClock // this.chkSetClock.AutoSize = true; + this.chkSetClock.Checked = true; + this.chkSetClock.CheckState = System.Windows.Forms.CheckState.Checked; this.chkSetClock.Location = new System.Drawing.Point(16, 21); this.chkSetClock.Name = "chkSetClock"; this.chkSetClock.Size = new System.Drawing.Size(71, 17); @@ -532,9 +534,9 @@ this.chkVGAoutput.AutoSize = true; this.chkVGAoutput.Location = new System.Drawing.Point(16, 51); this.chkVGAoutput.Name = "chkVGAoutput"; - this.chkVGAoutput.Size = new System.Drawing.Size(118, 17); + this.chkVGAoutput.Size = new System.Drawing.Size(136, 17); this.chkVGAoutput.TabIndex = 20; - this.chkVGAoutput.Text = "Display VGA output"; + this.chkVGAoutput.Text = " VGA Display output off"; this.chkVGAoutput.UseVisualStyleBackColor = true; // // chkFullscreen @@ -656,6 +658,7 @@ // // txtFloppyB // + this.txtFloppyB.Enabled = false; this.txtFloppyB.Location = new System.Drawing.Point(32, 113); this.txtFloppyB.Name = "txtFloppyB"; this.txtFloppyB.Size = new System.Drawing.Size(369, 20); @@ -663,6 +666,7 @@ // // txtFloppyA // + this.txtFloppyA.Enabled = false; this.txtFloppyA.Location = new System.Drawing.Point(32, 49); this.txtFloppyA.Name = "txtFloppyA"; this.txtFloppyA.Size = new System.Drawing.Size(369, 20); @@ -739,6 +743,7 @@ // // txtHDD // + this.txtHDD.Enabled = false; this.txtHDD.Location = new System.Drawing.Point(73, 163); this.txtHDD.Name = "txtHDD"; this.txtHDD.Size = new System.Drawing.Size(341, 20); @@ -746,6 +751,7 @@ // // txtHDC // + this.txtHDC.Enabled = false; this.txtHDC.Location = new System.Drawing.Point(73, 122); this.txtHDC.Name = "txtHDC"; this.txtHDC.Size = new System.Drawing.Size(341, 20); @@ -753,6 +759,7 @@ // // txtHDB // + this.txtHDB.Enabled = false; this.txtHDB.Location = new System.Drawing.Point(73, 77); this.txtHDB.Name = "txtHDB"; this.txtHDB.Size = new System.Drawing.Size(341, 20); @@ -760,6 +767,7 @@ // // txtHDA // + this.txtHDA.Enabled = false; this.txtHDA.Location = new System.Drawing.Point(73, 30); this.txtHDA.Name = "txtHDA"; this.txtHDA.Size = new System.Drawing.Size(341, 20);

1 0

[cwittich] 22456: for some reason tsvn did not add this file
by cwittich＠svn.reactos.org 21 Jun '06

21 Jun '06

Author: cwittich Date: Wed Jun 21 16:39:56 2006 New Revision: 22456 URL: http://svn.reactos.ru/svn/reactos?rev=22456&view=rev Log: for some reason tsvn did not add this file Added: trunk/tools/Qemu GUI/res/audio-volume-high.gif (with props) Added: trunk/tools/Qemu GUI/res/audio-volume-high.gif URL: http://svn.reactos.ru/svn/reactos/trunk/tools/Qemu%20GUI/res/audio-volume-h… ============================================================================== Binary file - no diff available. Propchange: trunk/tools/Qemu GUI/res/audio-volume-high.gif ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

1 0

[cwittich] 22455: add resources
by cwittich＠svn.reactos.org 21 Jun '06

21 Jun '06

Author: cwittich Date: Wed Jun 21 16:38:08 2006 New Revision: 22455 URL: http://svn.reactos.ru/svn/reactos?rev=22455&view=rev Log: add resources Added: trunk/tools/Qemu GUI/Properties/ trunk/tools/Qemu GUI/Properties/Resources.Designer.cs trunk/tools/Qemu GUI/Properties/Resources.resx trunk/tools/Qemu GUI/res/ Added: trunk/tools/Qemu GUI/Properties/Resources.Designer.cs URL: http://svn.reactos.ru/svn/reactos/trunk/tools/Qemu%20GUI/Properties/Resourc… ============================================================================== --- trunk/tools/Qemu GUI/Properties/Resources.Designer.cs (added) +++ trunk/tools/Qemu GUI/Properties/Resources.Designer.cs Wed Jun 21 16:38:08 2006 @@ -1,0 +1,70 @@ +ï»¿//------------------------------------------------------------------------------ +// <auto-generated> +// Dieser Code wurde von einem Tool generiert. +// Laufzeitversion:2.0.50727.42 +// +// Ãnderungen an dieser Datei kÃ¶nnen falsches Verhalten verursachen und gehen verloren, wenn +// der Code erneut generiert wird. +// </auto-generated> +//------------------------------------------------------------------------------ + +namespace Qemu_GUI.Properties { + using System; + + + /// <summary> + /// Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. + /// </summary> + // Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert + // -Klasse Ã¼ber ein Tool wie ResGen oder Visual Studio automatisch generiert. + // Um einen Member hinzuzufÃ¼gen oder zu entfernen, bearbeiten Sie die .ResX-Datei und fÃ¼hren dann ResGen + // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() { + } + + /// <summary> + /// Gibt die zwischengespeicherte ResourceManager-Instanz zurÃ¼ck, die von dieser Klasse verwendet wird. + /// </summary> + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Qemu_GUI.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// <summary> + /// Ãberschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads fÃ¼r alle + /// Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. + /// </summary> + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + + internal static System.Drawing.Bitmap audio_volume_high { + get { + object obj = ResourceManager.GetObject("audio-volume-high", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + } +} Added: trunk/tools/Qemu GUI/Properties/Resources.resx URL: http://svn.reactos.ru/svn/reactos/trunk/tools/Qemu%20GUI/Properties/Resourc… ============================================================================== --- trunk/tools/Qemu GUI/Properties/Resources.resx (added) +++ trunk/tools/Qemu GUI/Properties/Resources.resx Wed Jun 21 16:38:08 2006 @@ -1,0 +1,124 @@ +ï»¿<?xml version="1.0" encoding="utf-8"?> +<root> +  + <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> + <xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> + <xsd:element name="root" msdata:IsDataSet="true"> + <xsd:complexType> + <xsd:choice maxOccurs="unbounded"> + <xsd:element name="metadata"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" /> + </xsd:sequence> + <xsd:attribute name="name" use="required" type="xsd:string" /> + <xsd:attribute name="type" type="xsd:string" /> + <xsd:attribute name="mimetype" type="xsd:string" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="assembly"> + <xsd:complexType> + <xsd:attribute name="alias" type="xsd:string" /> + <xsd:attribute name="name" type="xsd:string" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="data"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> + <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> + <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="resheader"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" /> + </xsd:complexType> + </xsd:element> + </xsd:choice> + </xsd:complexType> + </xsd:element> + </xsd:schema> + <resheader name="resmimetype"> + <value>text/microsoft-resx</value> + </resheader> + <resheader name="version"> + <value>2.0</value> + </resheader> + <resheader name="reader"> + <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <resheader name="writer"> + <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> + <data name="audio-volume-high" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\res\audio-volume-high.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> +</root>

1 0

[cwittich] 22454: -forgot to commit frmMain.resx -some code changes
by cwittich＠svn.reactos.org 21 Jun '06

21 Jun '06

Author: cwittich Date: Wed Jun 21 16:35:52 2006 New Revision: 22454 URL: http://svn.reactos.ru/svn/reactos?rev=22454&view=rev Log: -forgot to commit frmMain.resx -some code changes Added: trunk/tools/Qemu GUI/frmMain.resx Modified: trunk/tools/Qemu GUI/QEmu.cs trunk/tools/Qemu GUI/Qemu GUI.suo trunk/tools/Qemu GUI/frmMain.cs Modified: trunk/tools/Qemu GUI/QEmu.cs URL: http://svn.reactos.ru/svn/reactos/trunk/tools/Qemu%20GUI/QEmu.cs?rev=22454&… ============================================================================== --- trunk/tools/Qemu GUI/QEmu.cs (original) +++ trunk/tools/Qemu GUI/QEmu.cs Wed Jun 21 16:35:52 2006 @@ -17,6 +17,7 @@ private Audio m_Audio = new Audio(); private Debug m_Debug = new Debug(); private Paths m_Paths = new Paths(); + private CDROM m_CDROM = new CDROM(); public QEmu() { @@ -77,6 +78,13 @@ set { this.m_Floppies = value; } } + [XmlElement("CDROM")] + public CDROM CDROM + { + get { return m_CDROM; } + set { this.m_CDROM = value; } + } + [XmlElement("Harddisks")] public Harddisks Harddisks { @@ -132,6 +140,15 @@ arg = arg + "-hd" + ((char) i + 97) + " " + this.Harddisks.HDD[i].Path + " "; } + + /* CD-ROM */ + if (this.CDROM.Enabled) + { + if (this.CDROM.UseFromHost) + arg = arg + "-cdrom " + this.CDROM.HostDrive + " "; + else if (this.CDROM.Image.Length > 0) + arg = arg + "-cdrom " + this.CDROM.Image + " "; + } return arg; } @@ -255,6 +272,22 @@ } } + public class CDROM + { + [XmlAttribute("Image")] + public string Image; + [XmlAttribute("UseFromHost")] + public bool UseFromHost; + [XmlAttribute("HostDrive")] + public string HostDrive; + [XmlAttribute("Enabled")] + public bool Enabled; + + public CDROM() + { + } + } + public class Drive { [XmlAttribute("Path")] Modified: trunk/tools/Qemu GUI/Qemu GUI.suo URL: http://svn.reactos.ru/svn/reactos/trunk/tools/Qemu%20GUI/Qemu%20GUI.suo?rev… ============================================================================== Binary files - no diff available. Modified: trunk/tools/Qemu GUI/frmMain.cs URL: http://svn.reactos.ru/svn/reactos/trunk/tools/Qemu%20GUI/frmMain.cs?rev=224… ============================================================================== --- trunk/tools/Qemu GUI/frmMain.cs (original) +++ trunk/tools/Qemu GUI/frmMain.cs Wed Jun 21 16:35:52 2006 @@ -1639,21 +1639,7 @@ /* private string GetArgv() { - - - /// cdrom - if ((chkUseCDROM.Checked == true) && (hdd_on == false)) - { - if (optHostCDROM.Checked == true) - { - arg = arg + "-cdrom " + cboCDROM.Text + " "; - } - else if (txtCDROM.Text != "" && txtCDROM.Text != null) - { - arg = arg + "-cdrom " + txtCDROM.Text + " "; - } - } - + /// boot options if (cboBootFrom.Text == "Floppy") { @@ -1906,6 +1892,13 @@ numMemory.Value = qemu.Misc.Memory; numSMP.Value = qemu.Misc.CPUs; + /* CD-ROM */ + optHostCDROM.Checked = qemu.CDROM.UseFromHost; + optCDImage.Checked = !qemu.CDROM.UseFromHost; + txtCDROM.Text = qemu.CDROM.Image; + cboCDROM.Text = qemu.CDROM.HostDrive; + chkUseCDROM.Checked = qemu.CDROM.Enabled; + /* Paths */ txtQEmuPath.Text = qemu.Paths.QEmu; txtVDKPath.Text = qemu.Paths.VDK; @@ -1929,6 +1922,12 @@ qemu.Floppies.FDD[0].Path = txtFloppyA.Text; qemu.Floppies.FDD[1].Enabled = chkFloppyB.Checked; qemu.Floppies.FDD[1].Path = txtFloppyB.Text; + + /* CD-ROM */ + qemu.CDROM.UseFromHost = optHostCDROM.Checked; + qemu.CDROM.Image = txtCDROM.Text; + qemu.CDROM.HostDrive = cboCDROM.Text; + qemu.CDROM.Enabled = chkUseCDROM.Checked; /* Harddisks */ qemu.Harddisks.HDD[0].Enabled = chkUseHDA.Checked; Added: trunk/tools/Qemu GUI/frmMain.resx URL: http://svn.reactos.ru/svn/reactos/trunk/tools/Qemu%20GUI/frmMain.resx?rev=2… ============================================================================== --- trunk/tools/Qemu GUI/frmMain.resx (added) +++ trunk/tools/Qemu GUI/frmMain.resx Wed Jun 21 16:35:52 2006 @@ -1,0 +1,180 @@ +<?xml version="1.0" encoding="utf-8"?> +<root> +  + <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> + <xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> + <xsd:element name="root" msdata:IsDataSet="true"> + <xsd:complexType> + <xsd:choice maxOccurs="unbounded"> + <xsd:element name="metadata"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" /> + </xsd:sequence> + <xsd:attribute name="name" use="required" type="xsd:string" /> + <xsd:attribute name="type" type="xsd:string" /> + <xsd:attribute name="mimetype" type="xsd:string" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="assembly"> + <xsd:complexType> + <xsd:attribute name="alias" type="xsd:string" /> + <xsd:attribute name="name" type="xsd:string" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="data"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> + <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> + <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="resheader"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" /> + </xsd:complexType> + </xsd:element> + </xsd:choice> + </xsd:complexType> + </xsd:element> + </xsd:schema> + <resheader name="resmimetype"> + <value>text/microsoft-resx</value> + </resheader> + <resheader name="version"> + <value>2.0</value> + </resheader> + <resheader name="reader"> + <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <resheader name="writer"> + <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <data name="txtAbout.Text" xml:space="preserve"> + <value>This program is written by Magnus Olsen for ReactOS in C# to use with Qemu and VDK + + License GPL source code is in ReactOS SVN + +Copyright (C) 2006 By Magnus Olsen +(magnus(a)greatlord.com / greatlord(a)reactos.com)</value> + </data> + <metadata name="openFile.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <value>23, 33</value> + </metadata> + <metadata name="folderBrowserDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <value>116, 33</value> + </metadata> + <metadata name="saveFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <value>274, 33</value> + </metadata> + <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> + <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value> + AAABAAEAICAAAAAAAACoCAAAFgAAACgAAAAgAAAAQAAAAAEACAAAAAAAAAQAAAAAAAAAAAAAAAEAAAAB + AAAAAAAAAACAAACAAAAAgIAAgAAAAIAAgACAgAAAwMDAAMDcwADwyqYABAQEAAgICAAMDAwAERERABYW + FgAcHBwAIiIiACkpKQBVVVUATU1NAEJCQgA5OTkAgHz/AFBQ/wCTANYA/+zMAMbW7wDW5+cAkKmtAAAA + MwAAAGYAAACZAAAAzAAAMwAAADMzAAAzZgAAM5kAADPMAAAz/wAAZgAAAGYzAABmZgAAZpkAAGbMAABm + /wAAmQAAAJkzAACZZgAAmZkAAJnMAACZ/wAAzAAAAMwzAADMZgAAzJkAAMzMAADM/wAA/2YAAP+ZAAD/ + zAAzAAAAMwAzADMAZgAzAJkAMwDMADMA/wAzMwAAMzMzADMzZgAzM5kAMzPMADMz/wAzZgAAM2YzADNm + ZgAzZpkAM2bMADNm/wAzmQAAM5kzADOZZgAzmZkAM5nMADOZ/wAzzAAAM8wzADPMZgAzzJkAM8zMADPM + /wAz/zMAM/9mADP/mQAz/8wAM///AGYAAABmADMAZgBmAGYAmQBmAMwAZgD/AGYzAABmMzMAZjNmAGYz + mQBmM8wAZjP/AGZmAABmZjMAZmZmAGZmmQBmZswAZpkAAGaZMwBmmWYAZpmZAGaZzABmmf8AZswAAGbM + MwBmzJkAZszMAGbM/wBm/wAAZv8zAGb/mQBm/8wAzAD/AP8AzACZmQAAmTOZAJkAmQCZAMwAmQAAAJkz + MwCZAGYAmTPMAJkA/wCZZgAAmWYzAJkzZgCZZpkAmWbMAJkz/wCZmTMAmZlmAJmZmQCZmcwAmZn/AJnM + AACZzDMAZsxmAJnMmQCZzMwAmcz/AJn/AACZ/zMAmcxmAJn/mQCZ/8wAmf//AMwAAACZADMAzABmAMwA + mQDMAMwAmTMAAMwzMwDMM2YAzDOZAMwzzADMM/8AzGYAAMxmMwCZZmYAzGaZAMxmzACZZv8AzJkAAMyZ + MwDMmWYAzJmZAMyZzADMmf8AzMwAAMzMMwDMzGYAzMyZAMzMzADMzP8AzP8AAMz/MwCZ/2YAzP+ZAMz/ + zADM//8AzAAzAP8AZgD/AJkAzDMAAP8zMwD/M2YA/zOZAP8zzAD/M/8A/2YAAP9mMwDMZmYA/2aZAP9m + zADMZv8A/5kAAP+ZMwD/mWYA/5mZAP+ZzAD/mf8A/8wAAP/MMwD/zGYA/8yZAP/MzAD/zP8A//8zAMz/ + ZgD//5kA///MAGZm/wBm/2YAZv//AP9mZgD/Zv8A//9mACEApQBfX18Ad3d3AIaGhgCWlpYAy8vLALKy + sgDX19cA3d3dAOPj4wDq6uoA8fHxAPj4+ADw+/8ApKCgAICAgAAAAP8AAP8AAAD//wD/AAAA/wD/AP// + AAD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAP///wf////yB//////////////////v8P///7z////////v7gf///////L3//////// + /5Ly//////8H7gf/////8v//////8Pf//+7w9+34bewH7///kvD///////H///Lz////////8PDv9+7u + 7+zv7+3rkrz/////////8/T//7z///////fv7vLzBwfv8Qft97zv7fj///////+8////B//////377zx + 8/MHvPPx7+687/eR+Oz//////wf/B//3////9+/u8vT1B/H08e/zvAeS95GRkZH/////7//3///x///3 + u/H09Qf09fC89fIHB/DtrpGR7Oz///////8H/+//7fe88/UH9PW88vX08/D39+7tkZH4kf//B//y/+// + //GR9/D0B/T1vPL19fTz8vLt9wftkfiRkv/s/+////H/7JHv8e/09bzy//X19PPx8PHtu/DtkZGS9/// + ////7///ke/v9PW88vX19fX08vHw8PP38fLt7ZH//+//////vK6R9/DzB/H19fX19PPy8fHy9PQH9PPt + kff0///////3kZEH8Ae88/Pz8/Py8fDw8fP09PHu9PDsB5L///////+R7e7v7/C88PDw8O4H7++7CfHz + 9PDw9O/3/////////+vu95Lu7+8HBwcH7/eS7fe1u/Hz9Afx8uz/////////7/f4B5GR7ZL395Ltka6u + kbu7CfDx8+/u7v//////////ru+Ri66urvj4665tbGyR7vHwCQm77vf/kv//////B//s72xsbGxsbGxs + bGxsbK737ru7u7Xx9//u/////////weubGxsbGxsZmZmZmZskbu7kZH3u/Dy////////7////2xsi66R + ka5sZmZmbK7t9/eRrpG8///3/+////8H/wf//2yutbu7kWxmZmZsbK6Rka6uu/H//wf/7v///+7/8v// + /4u78Ly1bGZDQ2xsbGxsrrvx////////////7v///////5G7u5FsZkNmZmxsbK67///////////////v + 7v////////+ubGxmZmZsbIuRu//////////u7//////v/////////+7//66ubK6R//8H/////////7z/ + //////8H///07vf/////7v///wf/////7wfy///x///////////yvO/////0B/////////8H8v////+8 + 8v//////////////Bwfv/////////////////+8HB/////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAD///// +</value> + </data> +</root>

1 0

[cwittich] 22453: -VS8 Project -renamed Form1 to frmMain -done some more work (design/refactoring/...) -still not working
by cwittich＠svn.reactos.org 21 Jun '06

21 Jun '06

Author: cwittich Date: Wed Jun 21 16:06:04 2006 New Revision: 22453 URL: http://svn.reactos.ru/svn/reactos?rev=22453&view=rev Log: -VS8 Project -renamed Form1 to frmMain -done some more work (design/refactoring/...) -still not working Added: trunk/tools/Qemu GUI/frmMain.cs - copied, changed from r22445, trunk/tools/Qemu GUI/Form1.cs Modified: trunk/tools/Qemu GUI/QEmu.cs trunk/tools/Qemu GUI/Qemu GUI.csproj trunk/tools/Qemu GUI/Qemu GUI.csproj.user trunk/tools/Qemu GUI/Qemu GUI.sln trunk/tools/Qemu GUI/Qemu GUI.suo [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/tools/Qemu GUI/QEmu.cs URL: http://svn.reactos.ru/svn/reactos/trunk/tools/Qemu%20GUI/QEmu.cs?rev=22453&… Modified: trunk/tools/Qemu GUI/Qemu GUI.csproj URL: http://svn.reactos.ru/svn/reactos/trunk/tools/Qemu%20GUI/Qemu%20GUI.csproj?… Modified: trunk/tools/Qemu GUI/Qemu GUI.csproj.user URL: http://svn.reactos.ru/svn/reactos/trunk/tools/Qemu%20GUI/Qemu%20GUI.csproj.… Modified: trunk/tools/Qemu GUI/Qemu GUI.sln URL: http://svn.reactos.ru/svn/reactos/trunk/tools/Qemu%20GUI/Qemu%20GUI.sln?rev… Modified: trunk/tools/Qemu GUI/Qemu GUI.suo URL: http://svn.reactos.ru/svn/reactos/trunk/tools/Qemu%20GUI/Qemu%20GUI.suo?rev… Copied: trunk/tools/Qemu GUI/frmMain.cs (from r22445, trunk/tools/Qemu GUI/Form1.cs) URL: http://svn.reactos.ru/svn/reactos/trunk/tools/Qemu%20GUI/frmMain.cs?p2=trun…

1 0

[hpoussin] 22452: Fix compilation
by hpoussin＠svn.reactos.org 21 Jun '06

21 Jun '06

Author: hpoussin Date: Wed Jun 21 15:45:11 2006 New Revision: 22452 URL: http://svn.reactos.ru/svn/reactos?rev=22452&view=rev Log: Fix compilation Modified: trunk/reactos/base/services/rpcss/rpcss.c Modified: trunk/reactos/base/services/rpcss/rpcss.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/services/rpcss/rpcss.c… ============================================================================== --- trunk/reactos/base/services/rpcss/rpcss.c (original) +++ trunk/reactos/base/services/rpcss/rpcss.c Wed Jun 21 15:45:11 2006 @@ -40,8 +40,6 @@ SERVICE_TABLE_ENTRY ServiceTable[] = {{"RpcSs", ServiceMain},{NULL, NULL}}; #endif - HANDLE hEvent; - DPRINT("RpcSs service\n"); #if 0

1 0

[tretiakov] 22451: Fix potential buffer overflow and unchecked return (bug 1527). Update headers.
by tretiakov＠svn.reactos.org 21 Jun '06

21 Jun '06

Author: tretiakov Date: Wed Jun 21 15:25:22 2006 New Revision: 22451 URL: http://svn.reactos.ru/svn/reactos?rev=22451&view=rev Log: Fix potential buffer overflow and unchecked return (bug 1527). Update headers. Modified: trunk/reactos/base/services/rpcss/endpoint.c trunk/reactos/base/services/rpcss/rpcss.c Modified: trunk/reactos/base/services/rpcss/endpoint.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/services/rpcss/endpoin… ============================================================================== --- trunk/reactos/base/services/rpcss/endpoint.c (original) +++ trunk/reactos/base/services/rpcss/endpoint.c Wed Jun 21 15:25:22 2006 @@ -1,28 +1,9 @@ -/* - * ReactOS kernel - * Copyright (C) 2002 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: services/rpcss/endpoint.c - * PURPOSE: RPC server - * PROGRAMMER: Eric Kohl +/* + * PROJECT: ReactOS RpcSs service + * LICENSE: GPL - See COPYING in the top level directory + * FILE: services/rpcss/rpcss.c + * PURPOSE: Endpoint mapper + * COPYRIGHT: Copyright 2002 Eric Kohl */ /* INCLUDES *****************************************************************/ Modified: trunk/reactos/base/services/rpcss/rpcss.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/services/rpcss/rpcss.c… ============================================================================== --- trunk/reactos/base/services/rpcss/rpcss.c (original) +++ trunk/reactos/base/services/rpcss/rpcss.c Wed Jun 21 15:25:22 2006 @@ -1,28 +1,9 @@ -/* - * ReactOS kernel - * Copyright (C) 2002 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel +/* + * PROJECT: ReactOS RpcSs service + * LICENSE: GPL - See COPYING in the top level directory * FILE: services/rpcss/rpcss.c - * PURPOSE: RPC server - * PROGRAMMER: Eric Kohl + * PURPOSE: Service initialization + * COPYRIGHT: Copyright 2002 Eric Kohl */ /* INCLUDES *****************************************************************/ @@ -40,33 +21,16 @@ /* FUNCTIONS *****************************************************************/ -void -PrintString(char* fmt,...) -{ - char buffer[512]; - va_list ap; - - va_start(ap, fmt); - vsprintf(buffer, fmt, ap); - va_end(ap); - - OutputDebugStringA(buffer); -} - - VOID CALLBACK ServiceMain(DWORD argc, LPTSTR *argv) { - PrintString("ServiceMain() called\n"); - + DPRINT("ServiceMain() called\n"); StartEndpointMapper(); - - PrintString("ServiceMain() done\n"); - + DPRINT("ServiceMain() done\n"); } @@ -78,26 +42,17 @@ HANDLE hEvent; - PrintString("RpcSs service\n"); - - - + DPRINT("RpcSs service\n"); #if 0 StartServiceCtrlDispatcher(ServiceTable); #endif - ServiceMain(0, NULL); + DPRINT("RpcSS: done\n"); - hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); - WaitForSingleObject(hEvent, INFINITE); - - PrintString("EventLog: done\n"); - - ExitThread(0); - return(0); + return 0; } /* EOF */

1 0

[fireball] 22450: Thomas Weidenmueller: Remove rtl dependency
by fireball＠svn.reactos.org 21 Jun '06

21 Jun '06

Author: fireball Date: Wed Jun 21 14:03:33 2006 New Revision: 22450 URL: http://svn.reactos.ru/svn/reactos?rev=22450&view=rev Log: Thomas Weidenmueller: Remove rtl dependency Modified: trunk/reactos/dll/cpl/powercfg/powercfg.rbuild trunk/reactos/dll/win32/powrprof/powrprof.rbuild Modified: trunk/reactos/dll/cpl/powercfg/powercfg.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/powercfg/powercfg.r… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/powercfg.rbuild (original) +++ trunk/reactos/dll/cpl/powercfg/powercfg.rbuild Wed Jun 21 14:03:33 2006 @@ -12,7 +12,6 @@ <library>user32</library> <library>powrprof</library> <library>comctl32</library> - <library>rtl</library> <file>powercfg.c</file> <file>powershemes.c</file> <file>alarms.c</file> Modified: trunk/reactos/dll/win32/powrprof/powrprof.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/powrprof/powrprof… ============================================================================== --- trunk/reactos/dll/win32/powrprof/powrprof.rbuild (original) +++ trunk/reactos/dll/win32/powrprof/powrprof.rbuild Wed Jun 21 14:03:33 2006 @@ -11,7 +11,6 @@ <define name="WINVER">0x501</define> <library>wine</library> <library>ntdll</library> - <library>rtl</library> <library>kernel32</library> <library>ntoskrnl</library> <file>powrprof.c</file>

1 0

[hpoussin] 22449: Handle MachineName parameter in SetupDiCreateDeviceInfoListExW Eric, can you take care of the change in CM_Connect_MachineW?
by hpoussin＠svn.reactos.org 21 Jun '06

21 Jun '06

Author: hpoussin Date: Wed Jun 21 13:00:17 2006 New Revision: 22449 URL: http://svn.reactos.ru/svn/reactos?rev=22449&view=rev Log: Handle MachineName parameter in SetupDiCreateDeviceInfoListExW Eric, can you take care of the change in CM_Connect_MachineW? Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c trunk/reactos/dll/win32/setupapi/devclass.c trunk/reactos/dll/win32/setupapi/devinst.c Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/setupapi/cfgmgr.c… ============================================================================== --- trunk/reactos/dll/win32/setupapi/cfgmgr.c (original) +++ trunk/reactos/dll/win32/setupapi/cfgmgr.c Wed Jun 21 13:00:17 2006 @@ -251,7 +251,14 @@ TRACE("%s %p\n", debugstr_w(UNCServerName), phMachine); - pMachine = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MACHINE_INFO)); + if (!UNCServerName) + { + FIXME("Connection to local machine not implemented\n"); + *phMachine = NULL; + return CR_SUCCESS; + } + + pMachine = HeapAlloc(GetProcessHeap(), 0, sizeof(MACHINE_INFO)); if (pMachine == NULL) return CR_OUT_OF_MEMORY; Modified: trunk/reactos/dll/win32/setupapi/devclass.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/setupapi/devclass… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devclass.c (original) +++ trunk/reactos/dll/win32/setupapi/devclass.c Wed Jun 21 13:00:17 2006 @@ -1701,6 +1701,8 @@ PVOID callback_context = NULL; hDeviceInfo = SetupDiCreateDeviceInfoList(NULL, NULL); + if (hDeviceInfo == INVALID_HANDLE_VALUE) + goto cleanup; InstallParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS); if (!SetupDiGetDeviceInstallParamsW(hDeviceInfo, NULL, &InstallParams)) Modified: trunk/reactos/dll/win32/setupapi/devinst.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/setupapi/devinst.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devinst.c (original) +++ trunk/reactos/dll/win32/setupapi/devinst.c Wed Jun 21 13:00:17 2006 @@ -160,7 +160,7 @@ LPWSTR UNCServerName = NULL; DWORD size; DWORD rc; - //CONFIGRET cr; + CONFIGRET cr; HDEVINFO ret = (HDEVINFO)INVALID_HANDLE_VALUE;; TRACE("%s %p %s %p\n", debugstr_guid(ClassGuid), hwndParent, @@ -169,7 +169,7 @@ size = FIELD_OFFSET(struct DeviceInfoSet, szData); if (MachineName) size += (strlenW(MachineName) + 3) * sizeof(WCHAR); - list = HeapAlloc(GetProcessHeap(), 0, size); + list = MyMalloc(size); if (!list) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); @@ -193,13 +193,14 @@ SetLastError(rc); goto cleanup; } - UNCServerName = HeapAlloc(GetProcessHeap(), 0, (strlenW(MachineName) + 3) * sizeof(WCHAR)); + UNCServerName = MyMalloc((strlenW(MachineName) + 3) * sizeof(WCHAR)); if (!UNCServerName) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); goto cleanup; } + UNCServerName[0] = UNCServerName[1] = '\\'; strcpyW(UNCServerName + 2, MachineName); list->szData[0] = list->szData[1] = '\\'; strcpyW(list->szData + 2, MachineName); @@ -207,27 +208,15 @@ } else { - DWORD Size = MAX_PATH; list->HKLM = HKEY_LOCAL_MACHINE; - UNCServerName = HeapAlloc(GetProcessHeap(), 0, (MAX_PATH + 2) * sizeof(WCHAR)); - if (!UNCServerName) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - goto cleanup; - } - if (!GetComputerNameW(UNCServerName + 2, &Size)) - goto cleanup; list->MachineName = NULL; - } -#if 0 - UNCServerName[0] = UNCServerName[1] = '\\'; + } cr = CM_Connect_MachineW(UNCServerName, &list->hMachine); if (cr != CR_SUCCESS) { SetLastError(GetErrorCodeFromCrCode(cr)); goto cleanup; } -#endif InitializeListHead(&list->DriverListHead); InitializeListHead(&list->ListHead); @@ -240,10 +229,10 @@ { if (list->HKLM != NULL && list->HKLM != HKEY_LOCAL_MACHINE) RegCloseKey(list->HKLM); - HeapFree(GetProcessHeap(), 0, list); - } - } - HeapFree(GetProcessHeap(), 0, UNCServerName); + MyFree(list); + } + } + MyFree(UNCServerName); return ret; }

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