Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 22468: reverted GreatLords audio "fix" - it did not changed anything except the code was about 4 times longer
by cwittich＠svn.reactos.org 21 Jun '06

21 Jun '06

Author: cwittich Date: Wed Jun 21 20:18:44 2006 New Revision: 22468 URL: http://svn.reactos.ru/svn/reactos?rev=22468&view=rev Log: reverted GreatLords audio "fix" - it did not changed anything except the code was about 4 times longer Modified: trunk/tools/Qemu GUI/QEmu.cs Modified: trunk/tools/Qemu GUI/QEmu.cs URL: http://svn.reactos.ru/svn/reactos/trunk/tools/Qemu%20GUI/QEmu.cs?rev=22468&… ============================================================================== --- trunk/tools/Qemu GUI/QEmu.cs (original) +++ trunk/tools/Qemu GUI/QEmu.cs Wed Jun 21 20:18:44 2006 @@ -344,53 +344,26 @@ { bool audio_on = (this.ES1370 | this.OPL2 | this.Soundblaster | this.Speaker); - bool audio_check = false; if (!audio_on) return ""; string buffer = "-soundhw "; if (this.Speaker) - { - buffer += "pcspk"; - audio_check = true; - } + buffer += "pcspk,"; if (this.Soundblaster) - { - if (audio_check == true) - buffer += ","; - else - audio_check = true; - buffer += "sb16,"; - } if (this.OPL2) - { - if (audio_check == true) - buffer += ","; - else - audio_check = true; - - buffer += "adlib"; - } + buffer += "adlib,"; if (this.ES1370) - { - if (audio_check == true) - buffer += ","; - else - audio_check = true; - - buffer += "es1370"; - } + buffer += "es1370,"; + + return buffer.Substring(0, buffer.Length - 1) + " "; + } - buffer += " "; - - return buffer.Substring(0, buffer.Length - 1) + " "; - } - } public class Debug

1 0

[greatlrd] 22467: fixing cdrom setting so they working again
by greatlrd＠svn.reactos.org 21 Jun '06

21 Jun '06

Author: greatlrd Date: Wed Jun 21 19:42:58 2006 New Revision: 22467 URL: http://svn.reactos.ru/svn/reactos?rev=22467&view=rev Log: fixing cdrom setting so they working again Modified: trunk/tools/Qemu GUI/QEmu.cs trunk/tools/Qemu GUI/bin/Release/Qemu GUI.exe Modified: trunk/tools/Qemu GUI/QEmu.cs URL: http://svn.reactos.ru/svn/reactos/trunk/tools/Qemu%20GUI/QEmu.cs?rev=22467&… ============================================================================== --- trunk/tools/Qemu GUI/QEmu.cs (original) +++ trunk/tools/Qemu GUI/QEmu.cs Wed Jun 21 19:42:58 2006 @@ -474,7 +474,7 @@ if (this.UseFromHost) buffer = "-cdrom " + this.HostDrive + " "; else if (this.Image.Length > 0) - buffer = "-cdrom " + (char)34 + this.Image + (char)34 + " "; + buffer = "-cdrom \"" + this.Image + "\" "; } return buffer; } 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.

1 0

[greatlrd] 22466: fixing audio setting so they are working again
by greatlrd＠svn.reactos.org 21 Jun '06

21 Jun '06

Author: greatlrd Date: Wed Jun 21 19:41:15 2006 New Revision: 22466 URL: http://svn.reactos.ru/svn/reactos?rev=22466&view=rev Log: fixing audio setting so they are working again Modified: trunk/tools/Qemu GUI/QEmu.cs trunk/tools/Qemu GUI/bin/Release/Qemu GUI.exe Modified: trunk/tools/Qemu GUI/QEmu.cs URL: http://svn.reactos.ru/svn/reactos/trunk/tools/Qemu%20GUI/QEmu.cs?rev=22466&… ============================================================================== --- trunk/tools/Qemu GUI/QEmu.cs (original) +++ trunk/tools/Qemu GUI/QEmu.cs Wed Jun 21 19:41:15 2006 @@ -344,19 +344,49 @@ { bool audio_on = (this.ES1370 | this.OPL2 | this.Soundblaster | this.Speaker); + bool audio_check = false; if (!audio_on) return ""; string buffer = "-soundhw "; if (this.Speaker) - buffer += "pcspk,"; + { + buffer += "pcspk"; + audio_check = true; + } + if (this.Soundblaster) + { + if (audio_check == true) + buffer += ","; + else + audio_check = true; + buffer += "sb16,"; + } + if (this.OPL2) - buffer += "adlib,"; + { + if (audio_check == true) + buffer += ","; + else + audio_check = true; + + buffer += "adlib"; + } + if (this.ES1370) - buffer += "es1370,"; + { + if (audio_check == true) + buffer += ","; + else + audio_check = true; + + buffer += "es1370"; + } + + buffer += " "; return buffer.Substring(0, buffer.Length - 1) + " "; } @@ -379,14 +409,14 @@ if (this.SerialPort.Redirect) { if (this.SerialPort.FileName.Length > 0) - buffer = "-serial file:" + (char) 34 + this.SerialPort.FileName + (char) 34 + " "; + buffer = "-serial file: \"" + this.SerialPort.FileName + "\" "; } /* Parallel port */ if (this.ParallelPort.Redirect) { if (this.ParallelPort.FileName.Length > 0) - buffer += "-parallel file:" + (char) 34 + this.ParallelPort.FileName + (char) 34 + " "; + buffer += "-parallel file: \"" + this.ParallelPort.FileName + "\" "; } /* Standard VGA */ 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.

1 0

[greatlrd] 22465: 1. Adding support for img for hd 2. fixing hda to hdd working again 3. fixing floppy working again 4. remove StandardPC as checkbox and repalace it with a combobox, futer version like arm. x64, ppc of qemu is plan to be supported 5. alot other smaller bugs are fixed
by greatlrd＠svn.reactos.org 21 Jun '06

21 Jun '06

Author: greatlrd Date: Wed Jun 21 19:34:26 2006 New Revision: 22465 URL: http://svn.reactos.ru/svn/reactos?rev=22465&view=rev Log: 1. Adding support for img for hd 2. fixing hda to hdd working again 3. fixing floppy working again 4. remove StandardPC as checkbox and repalace it with a combobox, futer version like arm. x64, ppc of qemu is plan to be supported 5. alot other smaller bugs are fixed Modified: trunk/tools/Qemu GUI/QEmu.cs trunk/tools/Qemu GUI/Qemu GUI.suo trunk/tools/Qemu GUI/bin/Release/Qemu GUI.exe 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=22465&… ============================================================================== --- trunk/tools/Qemu GUI/QEmu.cs (original) +++ trunk/tools/Qemu GUI/QEmu.cs Wed Jun 21 19:34:26 2006 @@ -32,7 +32,7 @@ public bool CreateImage(string FileName, long Size, string Format) { long d = Size * 1024; - string argv = " create -f " + Format + " " + (char) 34 + FileName + (char) 34 + " " + d.ToString(); ; + string argv = " create -f " + Format + " \""+ FileName + "\" " + d.ToString(); ; Process p = new Process(); p.StartInfo.FileName = Path.GetDirectoryName (this.Paths.QEmu) + "\\" + "qemu-img.exe"; p.StartInfo.WorkingDirectory = Path.GetDirectoryName(this.Paths.QEmu); @@ -169,7 +169,17 @@ for (int i = 0; i < 4; i++) { if (this.HDD[i].Enabled && (this.HDD[i].Path.Length > 0)) - buffer += "-hd" + ((char) (i + 97)) + " " + (char) 34 + this.HDD[i].Path + (char) 34 +" "; + { + if (i == 0) + buffer += "-hda \"" + this.HDD[i].Path + "\" "; + if (i == 1) + buffer += "-hdb \"" + this.HDD[i].Path + "\" "; + if (i == 2) + buffer += "-hdc \"" + this.HDD[i].Path + "\" "; + if (i == 3) + buffer += "-hdd \""+ this.HDD[i].Path + "\" "; + + } } return buffer; } @@ -197,10 +207,10 @@ { string buffer = ""; if (this.FDD[0].Enabled && (this.FDD[0].Path.Length > 0)) - buffer += "-fda " + (char) 34 + this.FDD[0].Path + (char) 34 + " "; + buffer += "-fda \"" + this.FDD[0].Path + "\" "; if (this.FDD[1].Enabled && (this.FDD[1].Path.Length > 0)) - buffer += "-fdb " + (char) 34 + this.FDD[1].Path + (char) 34 + " "; + buffer += "-fdb \"" + this.FDD[1].Path + "\" "; return buffer; } @@ -243,8 +253,8 @@ public class Misc { - [XmlElement("StandardPC")] - public bool StandardPC; + [XmlElement("Machine")] + public string Machine; [XmlElement("Memory")] public int Memory; [XmlElement("CPUs")] @@ -285,10 +295,11 @@ buffer += "-no-kqemu "; /* Machine settings */ - if (!this.StandardPC) + if (this.Machine == "Standard PC") + buffer += "-M pc "; + if (this.Machine == "ISA only PC") buffer += "-M isapc "; - else - buffer += "-M pc "; + /* Boot options */ switch (this.BootFrom) 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/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 19:34:26 2006 @@ -19,8 +19,6 @@ private System.Windows.Forms.GroupBox grpMachine; private System.Windows.Forms.TabPage tabMisc; private System.Windows.Forms.TabControl HardDisk2; - private System.Windows.Forms.RadioButton optStandardPC; - private System.Windows.Forms.RadioButton optLegacyPC; private System.Windows.Forms.GroupBox grpFloppy; private System.Windows.Forms.CheckBox chkFloppyA; private System.Windows.Forms.CheckBox chkFloppyB; @@ -127,6 +125,7 @@ private Label lblImage; private TextBox txtVDKImage; private ComboBox cboVDKDrive; + private ComboBox cboMachineFrom; private QEmu qemu; public frmMain() @@ -165,8 +164,6 @@ { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain)); this.grpMachine = new System.Windows.Forms.GroupBox(); - this.optLegacyPC = new System.Windows.Forms.RadioButton(); - this.optStandardPC = new System.Windows.Forms.RadioButton(); this.HardDisk2 = new System.Windows.Forms.TabControl(); this.tabMisc = new System.Windows.Forms.TabPage(); this.groupBox6 = new System.Windows.Forms.GroupBox(); @@ -274,6 +271,7 @@ this.saveFileDialog1 = new System.Windows.Forms.SaveFileDialog(); this.btnLoad = new System.Windows.Forms.Button(); this.btnSave = new System.Windows.Forms.Button(); + this.cboMachineFrom = new System.Windows.Forms.ComboBox(); this.grpMachine.SuspendLayout(); this.HardDisk2.SuspendLayout(); this.tabMisc.SuspendLayout(); @@ -310,34 +308,13 @@ // // grpMachine // - this.grpMachine.Controls.Add(this.optLegacyPC); - this.grpMachine.Controls.Add(this.optStandardPC); + this.grpMachine.Controls.Add(this.cboMachineFrom); this.grpMachine.Location = new System.Drawing.Point(3, 3); this.grpMachine.Name = "grpMachine"; this.grpMachine.Size = new System.Drawing.Size(274, 48); this.grpMachine.TabIndex = 2; this.grpMachine.TabStop = false; this.grpMachine.Text = "Machine"; - // - // optLegacyPC - // - this.optLegacyPC.CausesValidation = false; - this.optLegacyPC.Location = new System.Drawing.Point(154, 16); - this.optLegacyPC.Name = "optLegacyPC"; - this.optLegacyPC.Size = new System.Drawing.Size(98, 24); - this.optLegacyPC.TabIndex = 5; - this.optLegacyPC.Text = "ISA only PC"; - // - // optStandardPC - // - this.optStandardPC.CausesValidation = false; - this.optStandardPC.Checked = true; - this.optStandardPC.Location = new System.Drawing.Point(19, 16); - this.optStandardPC.Name = "optStandardPC"; - this.optStandardPC.Size = new System.Drawing.Size(104, 24); - this.optStandardPC.TabIndex = 4; - this.optStandardPC.TabStop = true; - this.optStandardPC.Text = "Standard PC"; // // HardDisk2 // @@ -1416,6 +1393,18 @@ this.btnSave.TabIndex = 6; this.btnSave.Text = "Save"; this.btnSave.Click += new System.EventHandler(this.btnSave_Click); + // + // cboMachineFrom + // + this.cboMachineFrom.FormattingEnabled = true; + this.cboMachineFrom.Items.AddRange(new object[] { + "Standard PC", + "ISA only PC"}); + this.cboMachineFrom.Location = new System.Drawing.Point(19, 19); + this.cboMachineFrom.Name = "cboMachineFrom"; + this.cboMachineFrom.Size = new System.Drawing.Size(239, 21); + this.cboMachineFrom.TabIndex = 20; + this.cboMachineFrom.Text = "Standard PC"; // // frmMain // @@ -1522,28 +1511,28 @@ #region Harddisks private void btnBrowseHDA_Click(object sender, System.EventArgs e) { - openFile.Filter = "Harddisk images |*.vmdk;*.cloop;*.cow;*.qcow;*.raw"; + openFile.Filter = "Harddisk images |*.vmdk;*.cloop;*.cow;*.qcow;*.raw;*.img"; if (openFile.ShowDialog() == DialogResult.OK) txtHDA.Text = openFile.FileName; } private void btnBrowseHDB_Click(object sender, System.EventArgs e) { - openFile.Filter = "Harddisk images |*.vmdk;*.cloop;*.cow;*.qcow;*.raw"; + openFile.Filter = "Harddisk images |*.vmdk;*.cloop;*.cow;*.qcow;*.raw;*.img"; if (openFile.ShowDialog() == DialogResult.OK) qemu.Harddisks.HDD[1].Path = openFile.FileName; } private void btnBrowseHDC_Click(object sender, System.EventArgs e) { - openFile.Filter = "Harddisk images |*.vmdk;*.cloop;*.cow;*.qcow;*.raw"; + openFile.Filter = "Harddisk images |*.vmdk;*.cloop;*.cow;*.qcow;*.raw;*.img"; if (openFile.ShowDialog() == DialogResult.OK) txtHDC.Text = openFile.FileName; } private void btnBrowseHDD_Click(object sender, System.EventArgs e) { - openFile.Filter = "Harddisk images |*.vmdk;*.cloop;*.cow;*.qcow;*.raw"; + openFile.Filter = "Harddisk images |*.vmdk;*.cloop;*.cow;*.qcow;*.raw;*.img"; if (openFile.ShowDialog() == DialogResult.OK) txtHDD.Text = openFile.FileName; } @@ -1821,8 +1810,7 @@ private void LoadSettings() { /* Misc */ - optStandardPC.Checked = qemu.Misc.StandardPC; - optLegacyPC.Checked = !qemu.Misc.StandardPC; + cboMachineFrom.Text = qemu.Misc.Machine; numMemory.Value = qemu.Misc.Memory; numSMP.Value = qemu.Misc.CPUs; cboBootFrom.Text = qemu.Misc.BootFrom; @@ -1874,8 +1862,8 @@ private void SaveSettings() { - /* Misc */ - qemu.Misc.StandardPC = optStandardPC.Checked; + /* Misc */ + qemu.Misc.Machine = cboMachineFrom.SelectedText; qemu.Misc.Memory = (int) numMemory.Value; qemu.Misc.CPUs = (int) numSMP.Value; qemu.Misc.BootFrom = cboBootFrom.Text;

1 0

[cwittich] 22464: bugfix: loading of harddisk images should work again
by cwittich＠svn.reactos.org 21 Jun '06

21 Jun '06

Author: cwittich Date: Wed Jun 21 19:07:53 2006 New Revision: 22464 URL: http://svn.reactos.ru/svn/reactos?rev=22464&view=rev Log: bugfix: loading of harddisk images should work again Modified: trunk/tools/Qemu GUI/QEmu.cs Modified: trunk/tools/Qemu GUI/QEmu.cs URL: http://svn.reactos.ru/svn/reactos/trunk/tools/Qemu%20GUI/QEmu.cs?rev=22464&… ============================================================================== --- trunk/tools/Qemu GUI/QEmu.cs (original) +++ trunk/tools/Qemu GUI/QEmu.cs Wed Jun 21 19:07:53 2006 @@ -169,7 +169,7 @@ for (int i = 0; i < 4; i++) { if (this.HDD[i].Enabled && (this.HDD[i].Path.Length > 0)) - buffer += "-hd" + ((char)i + 97) + " " + (char) 34 + this.HDD[i].Path + (char) 34 +" "; + buffer += "-hd" + ((char) (i + 97)) + " " + (char) 34 + this.HDD[i].Path + (char) 34 +" "; } return buffer; }

1 0

[greatlrd] 22463: fixing a small bug
by greatlrd＠svn.reactos.org 21 Jun '06

21 Jun '06

Author: greatlrd Date: Wed Jun 21 18:59:26 2006 New Revision: 22463 URL: http://svn.reactos.ru/svn/reactos?rev=22463&view=rev Log: fixing a small bug Modified: trunk/tools/Qemu GUI/frmMain.cs 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 18:59:26 2006 @@ -577,6 +577,7 @@ // cboCDROM // this.cboCDROM.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cboCDROM.Enabled = false; this.cboCDROM.FormattingEnabled = true; this.cboCDROM.Location = new System.Drawing.Point(61, 77); this.cboCDROM.Name = "cboCDROM";

1 0

[cwittich] 22462: -forgot to commit resx file
by cwittich＠svn.reactos.org 21 Jun '06

21 Jun '06

Author: cwittich Date: Wed Jun 21 18:57:52 2006 New Revision: 22462 URL: http://svn.reactos.ru/svn/reactos?rev=22462&view=rev Log: -forgot to commit resx file Added: trunk/tools/Qemu GUI/frmError.resx Added: trunk/tools/Qemu GUI/frmError.resx URL: http://svn.reactos.ru/svn/reactos/trunk/tools/Qemu%20GUI/frmError.resx?rev=… ============================================================================== --- trunk/tools/Qemu GUI/frmError.resx (added) +++ trunk/tools/Qemu GUI/frmError.resx Wed Jun 21 18:57:52 2006 @@ -1,0 +1,123 @@ +<?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> + <metadata name="txtError.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> +</root>

1 0

[cwittich] 22461: -forgot to commit two files -some minor improvements
by cwittich＠svn.reactos.org 21 Jun '06

21 Jun '06

Author: cwittich Date: Wed Jun 21 18:56:14 2006 New Revision: 22461 URL: http://svn.reactos.ru/svn/reactos?rev=22461&view=rev Log: -forgot to commit two files -some minor improvements Added: trunk/tools/Qemu GUI/frmError.Designer.cs trunk/tools/Qemu GUI/frmError.cs Modified: trunk/tools/Qemu GUI/frmMain.cs Added: trunk/tools/Qemu GUI/frmError.Designer.cs URL: http://svn.reactos.ru/svn/reactos/trunk/tools/Qemu%20GUI/frmError.Designer.… ============================================================================== --- trunk/tools/Qemu GUI/frmError.Designer.cs (added) +++ trunk/tools/Qemu GUI/frmError.Designer.cs Wed Jun 21 18:56:14 2006 @@ -1,0 +1,75 @@ +ï»¿namespace Qemu_GUI +{ + partial class frmError + { + /// <summary> + /// Erforderliche Designervariable. + /// </summary> + private System.ComponentModel.IContainer components = null; + + /// <summary> + /// Verwendete Ressourcen bereinigen. + /// </summary> + /// <param name="disposing">True, wenn verwaltete Ressourcen gelÃ¶scht werden sollen; andernfalls False.</param> + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Vom Windows Form-Designer generierter Code + + /// <summary> + /// Erforderliche Methode fÃ¼r die DesignerunterstÃ¼tzung. + /// Der Inhalt der Methode darf nicht mit dem Code-Editor geÃ¤ndert werden. + /// </summary> + private void InitializeComponent() + { + this.txtError = new System.Windows.Forms.TextBox(); + this.btnOK = new System.Windows.Forms.Button(); + this.SuspendLayout(); + // + // txtError + // + this.txtError.Location = new System.Drawing.Point(12, 12); + this.txtError.Multiline = true; + this.txtError.Name = "txtError"; + this.txtError.Size = new System.Drawing.Size(318, 168); + this.txtError.TabIndex = 0; + // + // btnOK + // + this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK; + this.btnOK.Location = new System.Drawing.Point(122, 192); + this.btnOK.Name = "btnOK"; + this.btnOK.Size = new System.Drawing.Size(93, 23); + this.btnOK.TabIndex = 5; + this.btnOK.Text = "OK"; + this.btnOK.Click += new System.EventHandler(this.btnOK_Click); + // + // frmError + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(342, 224); + this.ControlBox = false; + this.Controls.Add(this.btnOK); + this.Controls.Add(this.txtError); + this.Name = "frmError"; + this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; + this.Text = "Error"; + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.Button btnOK; + public System.Windows.Forms.TextBox txtError; + } +} Added: trunk/tools/Qemu GUI/frmError.cs URL: http://svn.reactos.ru/svn/reactos/trunk/tools/Qemu%20GUI/frmError.cs?rev=22… ============================================================================== --- trunk/tools/Qemu GUI/frmError.cs (added) +++ trunk/tools/Qemu GUI/frmError.cs Wed Jun 21 18:56:14 2006 @@ -1,0 +1,23 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Text; +using System.Windows.Forms; + +namespace Qemu_GUI +{ + public partial class frmError : Form + { + public frmError() + { + InitializeComponent(); + } + + private void btnOK_Click(object sender, EventArgs e) + { + this.Close(); + } + } +} 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 18:56:14 2006 @@ -1309,7 +1309,7 @@ this.groupBox2.Size = new System.Drawing.Size(454, 195); this.groupBox2.TabIndex = 21; this.groupBox2.TabStop = false; - this.groupBox2.Text = "QEmu"; + this.groupBox2.Text = "Paths"; // // txtQEmuPath // @@ -1521,24 +1521,28 @@ #region Harddisks private void btnBrowseHDA_Click(object sender, System.EventArgs e) { + openFile.Filter = "Harddisk images |*.vmdk;*.cloop;*.cow;*.qcow;*.raw"; if (openFile.ShowDialog() == DialogResult.OK) txtHDA.Text = openFile.FileName; } private void btnBrowseHDB_Click(object sender, System.EventArgs e) { + openFile.Filter = "Harddisk images |*.vmdk;*.cloop;*.cow;*.qcow;*.raw"; if (openFile.ShowDialog() == DialogResult.OK) qemu.Harddisks.HDD[1].Path = openFile.FileName; } private void btnBrowseHDC_Click(object sender, System.EventArgs e) { + openFile.Filter = "Harddisk images |*.vmdk;*.cloop;*.cow;*.qcow;*.raw"; if (openFile.ShowDialog() == DialogResult.OK) txtHDC.Text = openFile.FileName; } private void btnBrowseHDD_Click(object sender, System.EventArgs e) { + openFile.Filter = "Harddisk images |*.vmdk;*.cloop;*.cow;*.qcow;*.raw"; if (openFile.ShowDialog() == DialogResult.OK) txtHDD.Text = openFile.FileName; } @@ -1720,7 +1724,21 @@ cboCDROM.SelectedIndex = 0; cboBootFrom.SelectedIndex = 1; - cboImageFormat.SelectedIndex = 4; + cboImageFormat.SelectedIndex = 4; + + /* try to load config.xml from current directory */ + try + { + XmlSerializer s = new XmlSerializer(typeof(QEmu)); + TextReader r = new StreamReader(".//config.xml"); + qemu = (QEmu)s.Deserialize(r); + r.Close(); + LoadSettings(); + } + catch + { + } + } #region Floppy @@ -1774,7 +1792,8 @@ #region Settings private void btnSave_Click(object sender, EventArgs e) { - SaveSettings(); + SaveSettings(); + saveFileDialog1.FileName = "config.xml"; saveFileDialog1.Filter = "QEmu GUI Config (*.xml)|*.xml"; if (saveFileDialog1.ShowDialog() == DialogResult.OK) {

1 0

[cwittich] 22460: first working version after the redesign
by cwittich＠svn.reactos.org 21 Jun '06

21 Jun '06

Author: cwittich Date: Wed Jun 21 18:40:56 2006 New Revision: 22460 URL: http://svn.reactos.ru/svn/reactos?rev=22460&view=rev Log: first working version after the redesign Modified: trunk/tools/Qemu GUI/QEmu.cs trunk/tools/Qemu GUI/Qemu GUI.csproj 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=22460&… ============================================================================== --- trunk/tools/Qemu GUI/QEmu.cs (original) +++ trunk/tools/Qemu GUI/QEmu.cs Wed Jun 21 18:40:56 2006 @@ -4,6 +4,7 @@ using System.Diagnostics; using System.Xml; using System.Xml.Serialization; +using System.IO; namespace Qemu_GUI { @@ -18,6 +19,7 @@ private Debug m_Debug = new Debug(); private Paths m_Paths = new Paths(); private CDROM m_CDROM = new CDROM(); + private string m_LastError = ""; public QEmu() { @@ -30,35 +32,54 @@ public bool CreateImage(string FileName, long Size, string Format) { long d = Size * 1024; - string argv = " create -f " + Format + " " + FileName + "." + Format + " " + d.ToString(); ; - - Process Qemu = new Process(); - Qemu.StartInfo.FileName = this.Paths.QEmu + "\\" + "qemu-img.exe"; - Qemu.StartInfo.WorkingDirectory = this.Paths.QEmu; - Qemu.StartInfo.Arguments = argv; + string argv = " create -f " + Format + " " + (char) 34 + FileName + (char) 34 + " " + d.ToString(); ; + Process p = new Process(); + p.StartInfo.FileName = Path.GetDirectoryName (this.Paths.QEmu) + "\\" + "qemu-img.exe"; + p.StartInfo.WorkingDirectory = Path.GetDirectoryName(this.Paths.QEmu); + p.StartInfo.Arguments = argv; + p.StartInfo.RedirectStandardError = true; + p.StartInfo.UseShellExecute = false; + p.StartInfo.CreateNoWindow = true; try { - Qemu.Start(); + p.Start(); + m_LastError = p.StandardError.ReadToEnd(); + if (m_LastError.Length > 0) + return false; } catch { + m_LastError = "qemu-img.exe not found!"; return false; } return true; } + public string GetLastError() + { + return m_LastError; + } + public bool Start() { - Process Qemu = new Process(); - Qemu.StartInfo.FileName = this.Paths.QEmu + "\\" + "qemu.exe"; - Qemu.StartInfo.WorkingDirectory = this.Paths.QEmu; - Qemu.StartInfo.Arguments = GetArgv(); + Process p = new Process(); + p.StartInfo.FileName = this.Paths.QEmu; + p.StartInfo.WorkingDirectory = Path.GetDirectoryName(this.Paths.QEmu); + p.StartInfo.Arguments = GetArgv(); + p.StartInfo.RedirectStandardError = true; + p.StartInfo.UseShellExecute = false; + p.StartInfo.CreateNoWindow = true; + try { - Qemu.Start(); + p.Start(); + m_LastError = p.StandardError.ReadToEnd(); + if (m_LastError.Length > 0) + return false; } catch { + m_LastError = "qemu.exe not found!"; return false; } return true; @@ -115,40 +136,16 @@ private string GetArgv() { - string arg = "-L " + this.Paths.QEmu + " "; - /* bool audio_on = false; */ - - /* Machine settings */ - if (!this.m_Misc.StandardPC) - arg = arg + "-M isapc "; - else - arg = arg + "-M pc "; - - - /* Floppy settings */ - if (this.Floppies.FDD[0].Enabled && (this.Floppies.FDD[0].Path.Length > 0)) - arg = arg + "-fda " + this.Floppies.FDD[0].Path + " "; - - if (this.Floppies.FDD[1].Enabled && (this.Floppies.FDD[1].Path.Length > 0)) - arg = arg + "-fdb " + this.Floppies.FDD[1].Path + " "; - - - /* Harddisk settings */ - for (int i = 0; i < 4; i++) - { - if (this.Harddisks.HDD[i].Enabled && (this.Harddisks.HDD[i].Path.Length > 0)) - 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 + " "; - } + string arg = "-L " + Path.GetDirectoryName(this.Paths.QEmu) + " "; + + arg += Misc.ToString(); + arg += Floppies.ToString(); + arg += Harddisks.ToString(); + arg += CDROM.ToString(); + arg += Audio.ToString(); + arg += Debug.ToString(); + + Console.WriteLine(arg); return arg; } @@ -166,6 +163,17 @@ m_HardDisks[i] = new Drive(); } + public override string ToString() + { + string buffer = ""; + for (int i = 0; i < 4; i++) + { + if (this.HDD[i].Enabled && (this.HDD[i].Path.Length > 0)) + buffer += "-hd" + ((char)i + 97) + " " + (char) 34 + this.HDD[i].Path + (char) 34 +" "; + } + return buffer; + } + [XmlElement("Harddisk")] public Drive[] HDD { @@ -185,6 +193,18 @@ m_Floppies[i] = new Drive(); } + public override string ToString() + { + string buffer = ""; + if (this.FDD[0].Enabled && (this.FDD[0].Path.Length > 0)) + buffer += "-fda " + (char) 34 + this.FDD[0].Path + (char) 34 + " "; + + if (this.FDD[1].Enabled && (this.FDD[1].Path.Length > 0)) + buffer += "-fdb " + (char) 34 + this.FDD[1].Path + (char) 34 + " "; + + return buffer; + } + [XmlElement("Floppy")] public Drive[] FDD { @@ -195,13 +215,29 @@ public class Paths { + private string m_QEmu = ""; + [XmlElement("QEmu")] - public string QEmu; + public string QEmu + { + get + { + return m_QEmu; + } + set + { + if (value != "") + m_QEmu = value; + else + m_QEmu = "."; + } + } [XmlElement("VDK")] - public string VDK; + public string VDK = "."; public Paths() { + m_QEmu = "."; } } @@ -213,6 +249,65 @@ public int Memory; [XmlElement("CPUs")] public int CPUs; + [XmlElement("BootFrom")] + public string BootFrom = ""; + [XmlElement("SetClock")] + public bool SetClock; + [XmlElement("Fullscreen")] + public bool Fullscreen; + [XmlElement("VGA")] + public bool VGA; + [XmlElement("KQEmu")] + public bool KQEmu; + + public override string ToString() + { + /* Memory settings */ + string buffer = "-m " + this.Memory.ToString() + " "; + + /* SMP settings */ + buffer += "-smp " + this.CPUs.ToString() + " "; + + /* Set clock */ + if (this.SetClock) + buffer += "-localtime "; + + /* No vga output */ + if (this.VGA) + buffer += "-nographic "; + + /* Fullscreen */ + if (this.Fullscreen) + buffer += "-full-screen "; + + /* KQEmu */ + if (!this.KQEmu) + buffer += "-no-kqemu "; + + /* Machine settings */ + if (!this.StandardPC) + buffer += "-M isapc "; + else + buffer += "-M pc "; + + /* Boot options */ + switch (this.BootFrom) + { + case "Floppy": + buffer += "-boot a "; + break; + case "Harddisk": + buffer += "-boot c "; + break; + case "CD-ROM": + buffer += "-boot d "; + break; + default: + break; + } + + return buffer; + } public Misc() { @@ -233,6 +328,28 @@ public Audio() { } + + public override string ToString() + { + bool audio_on = (this.ES1370 | this.OPL2 | this.Soundblaster | this.Speaker); + + if (!audio_on) + return ""; + + string buffer = "-soundhw "; + + if (this.Speaker) + buffer += "pcspk,"; + if (this.Soundblaster) + buffer += "sb16,"; + if (this.OPL2) + buffer += "adlib,"; + if (this.ES1370) + buffer += "es1370,"; + + return buffer.Substring(0, buffer.Length - 1) + " "; + } + } public class Debug @@ -242,6 +359,31 @@ [XmlElement("VBE3")] public bool VBE3; + + public override string ToString() + { + string buffer = ""; + + /* Serial port */ + if (this.SerialPort.Redirect) + { + if (this.SerialPort.FileName.Length > 0) + buffer = "-serial file:" + (char) 34 + this.SerialPort.FileName + (char) 34 + " "; + } + + /* Parallel port */ + if (this.ParallelPort.Redirect) + { + if (this.ParallelPort.FileName.Length > 0) + buffer += "-parallel file:" + (char) 34 + this.ParallelPort.FileName + (char) 34 + " "; + } + + /* Standard VGA */ + if (this.VBE3) + buffer += "-std-vga "; + + return buffer; + } public Debug() { @@ -283,6 +425,19 @@ [XmlAttribute("Enabled")] public bool Enabled; + public override string ToString() + { + string buffer = ""; + if (this.Enabled) + { + if (this.UseFromHost) + buffer = "-cdrom " + this.HostDrive + " "; + else if (this.Image.Length > 0) + buffer = "-cdrom " + (char)34 + this.Image + (char)34 + " "; + } + return buffer; + } + public CDROM() { } Modified: trunk/tools/Qemu GUI/Qemu GUI.csproj URL: http://svn.reactos.ru/svn/reactos/trunk/tools/Qemu%20GUI/Qemu%20GUI.csproj?… ============================================================================== --- trunk/tools/Qemu GUI/Qemu GUI.csproj (original) +++ trunk/tools/Qemu GUI/Qemu GUI.csproj Wed Jun 21 18:40:56 2006 @@ -96,6 +96,12 @@ <Compile Include="AssemblyInfo.cs"> <SubType>Code</SubType> </Compile> + <Compile Include="frmError.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="frmError.Designer.cs"> + <DependentUpon>frmError.cs</DependentUpon> + </Compile> <Compile Include="frmMain.cs"> <SubType>Form</SubType> </Compile> @@ -105,6 +111,10 @@ <DependentUpon>Resources.resx</DependentUpon> </Compile> <Compile Include="QEmu.cs" /> + <EmbeddedResource Include="frmError.resx"> + <SubType>Designer</SubType> + <DependentUpon>frmError.cs</DependentUpon> + </EmbeddedResource> <EmbeddedResource Include="frmMain.resx"> <DependentUpon>frmMain.cs</DependentUpon> <SubType>Designer</SubType> 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 18:40:56 2006 @@ -988,19 +988,17 @@ // // cboImageFormat // + this.cboImageFormat.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cboImageFormat.Items.AddRange(new object[] { "cloop", - "cow ", + "cow", "qcow", - "raw ", - "vmdk ", - "", - " "}); + "raw", + "vmdk"}); this.cboImageFormat.Location = new System.Drawing.Point(99, 39); this.cboImageFormat.Name = "cboImageFormat"; this.cboImageFormat.Size = new System.Drawing.Size(56, 21); this.cboImageFormat.TabIndex = 7; - this.cboImageFormat.Text = "vmdk "; // // tabAudio // @@ -1430,6 +1428,7 @@ this.ImeMode = System.Windows.Forms.ImeMode.On; this.MaximizeBox = false; this.Name = "frmMain"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "Qemu GUI Launcher Version 1.0 written by Magnus Olsen for ReactOS"; this.Load += new System.EventHandler(this.frmMain_Load); this.grpMachine.ResumeLayout(false); @@ -1492,8 +1491,20 @@ private void btnCreateImage_Click(object sender, System.EventArgs e) { + saveFileDialog1.Filter = "All files (*.*)|*.*"; + saveFileDialog1.FileName = "image." + cboImageFormat.Text; + saveFileDialog1.DefaultExt = cboImageFormat.Text; if (saveFileDialog1.ShowDialog() == DialogResult.OK) - qemu.CreateImage(saveFileDialog1.FileName, Convert.ToInt32(txtImageSize.Text), cboImageFormat.Text); + { + if (!qemu.CreateImage(saveFileDialog1.FileName, Convert.ToInt32(txtImageSize.Text), cboImageFormat.Text)) + { + frmError fError = new frmError(); + fError.txtError.Text = qemu.GetLastError(); + fError.ShowDialog(this); + } + else + MessageBox.Show("Image created"); + } } private void button11_Click(object sender, System.EventArgs e) @@ -1560,6 +1571,7 @@ #region CDROM private void btnBrowseCDROM_Click(object sender, System.EventArgs e) { + openFile.Filter = "CD-Images (*.iso)|*.iso"; if (openFile.ShowDialog() == DialogResult.OK) txtCDROM.Text = openFile.FileName; } @@ -1645,126 +1657,17 @@ private void btnLaunch_Click(object sender, System.EventArgs e) { SaveSettings(); - qemu.Start(); + if (!qemu.Start()) + { + frmError fError = new frmError(); + fError.txtError.Text = qemu.GetLastError(); + fError.ShowDialog(this); + } + } /* private string GetArgv() { - - /// boot options - if (cboBootFrom.Text == "Floppy") - { - arg = arg + "-boot a "; - } - else if (cboBootFrom.Text == "HardDisk") - { - arg = arg + "-boot c "; - } - - else if (cboBootFrom.Text == "CDRom") - { - arg = arg + "-boot d "; - } - - /// memmory setting - arg = arg + "-m " + numMemory.Value.ToString() + " "; - - // smp setting - arg = arg + "-smp " + numSMP.Value.ToString() + " "; - - // no vga output - if (chkVGAoutput.Checked == false) - { - arg = arg + "-nographic "; - } - - // set clock - if (chkSetClock.Checked) - { - arg = arg + "-localtime "; - } - - // fullscreen - if (chkFullscreen.Checked) - { - arg = arg + "-full-screen "; - } - - if (!chkKQEmu.Checked) - { - arg = arg + "-no-kqemu "; - } - - /// Audio setting - if (chkPCSpeaker.Checked == true) - { - audio_on = true; - arg = arg + "-soundhw pcspk"; - } - - if (chkSoundBlaster.Checked == true) - { - if (audio_on == false) - { - arg = arg + "-soundhw sb16"; - audio_on = true; - } - else - { - arg = arg + ",sb16"; - } - } - - if (chkOPL2.Checked == true) - { - if (audio_on == false) - { - arg = arg + "-soundhw adlib"; - audio_on = true; - } - else - { - arg = arg + ",adlib"; - } - } - - if (chkES1370.Checked == true) - { - if (audio_on == false) - { - arg = arg + "-soundhw es1370"; - audio_on = true; - } - else - { - arg = arg + ",es1370"; - } - } - - if (audio_on == true) - { - arg = arg + " "; - } - - /// serial - if (chkSerialToFile.Checked == true) - { - if (qemu.Debug.SerialPort.FileName != "") - arg = arg + "-serial file:" + qemu.Debug.SerialPort.FileName + " "; - } - - // paraell port - if (chkParallelToFile.Checked == true) - { - if (par_path != "") - arg = arg + "-parallel file:" + par_path +" "; - } - - // vga standard - if (chkVBE30.Checked == true) - { - arg = arg + "-std-vga "; - } // gdb if (checkBox14.Checked == true) @@ -1784,7 +1687,6 @@ arg = arg + "-loadvm "+qemu_state+" "; } - return arg; } */ @@ -1818,6 +1720,7 @@ cboCDROM.SelectedIndex = 0; cboBootFrom.SelectedIndex = 1; + cboImageFormat.SelectedIndex = 4; } #region Floppy @@ -1852,7 +1755,7 @@ { openFile.Filter = "Executable files (*.exe)|*.exe"; if (openFile.ShowDialog() == DialogResult.OK) - txtQEmuPath.Text = Path.GetDirectoryName(openFile.FileName); + txtQEmuPath.Text = openFile.FileName; } private void btnVDKBrowse_Click(object sender, EventArgs e) @@ -1902,18 +1805,50 @@ optLegacyPC.Checked = !qemu.Misc.StandardPC; numMemory.Value = qemu.Misc.Memory; numSMP.Value = qemu.Misc.CPUs; + cboBootFrom.Text = qemu.Misc.BootFrom; + chkSetClock.Checked = qemu.Misc.SetClock; + chkVGAoutput.Checked = qemu.Misc.VGA; + chkFullscreen.Checked = qemu.Misc.Fullscreen; + chkKQEmu.Checked = qemu.Misc.KQEmu; /* 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; + chkUseCDROM.Checked = qemu.CDROM.Enabled; + + /* Floppies */ + chkFloppyA.Checked = qemu.Floppies.FDD[0].Enabled; + txtFloppyA.Text = qemu.Floppies.FDD[0].Path; + chkFloppyB.Checked = qemu.Floppies.FDD[1].Enabled; + txtFloppyB.Text = qemu.Floppies.FDD[1].Path; /* Paths */ txtQEmuPath.Text = qemu.Paths.QEmu; txtVDKPath.Text = qemu.Paths.VDK; - grpVDK.Enabled = (txtVDKPath.Text.Length > 0); + grpVDK.Enabled = (txtVDKPath.Text.Length > 0); + + /* Harddisks */ + chkUseHDA.Checked = qemu.Harddisks.HDD[0].Enabled; + txtHDA.Text = qemu.Harddisks.HDD[0].Path; + chkUseHDB.Checked = qemu.Harddisks.HDD[1].Enabled; + txtHDB.Text = qemu.Harddisks.HDD[1].Path; + chkUseHDC.Checked = qemu.Harddisks.HDD[2].Enabled; + txtHDC.Text = qemu.Harddisks.HDD[2].Path; + chkUseHDD.Checked = qemu.Harddisks.HDD[3].Enabled; + txtHDD.Text = qemu.Harddisks.HDD[3].Path; + + /* Audio */ + chkES1370.Checked = qemu.Audio.ES1370; + chkSoundBlaster.Checked = qemu.Audio.Soundblaster; + chkPCSpeaker.Checked = qemu.Audio.Speaker; + chkOPL2.Checked = qemu.Audio.OPL2; + + /* Debug */ + chkSerialToFile.Checked = qemu.Debug.SerialPort.Redirect; + chkParallelToFile.Checked = qemu.Debug.ParallelPort.Redirect; + chkVBE30.Checked = qemu.Debug.VBE3; } @@ -1922,7 +1857,12 @@ /* Misc */ qemu.Misc.StandardPC = optStandardPC.Checked; qemu.Misc.Memory = (int) numMemory.Value; - qemu.Misc.CPUs = (int) numSMP.Value; + qemu.Misc.CPUs = (int) numSMP.Value; + qemu.Misc.BootFrom = cboBootFrom.Text; + qemu.Misc.SetClock = chkSetClock.Checked; + qemu.Misc.VGA = chkVGAoutput.Checked; + qemu.Misc.Fullscreen = chkFullscreen.Checked; + qemu.Misc.KQEmu = chkKQEmu.Checked; /* Paths */ qemu.Paths.QEmu = txtQEmuPath.Text;

1 0

[fireball] 22459: - Sync user32/buttons.c with Wine - Update wine-syncs doc
by fireball＠svn.reactos.org 21 Jun '06

21 Jun '06

Author: fireball Date: Wed Jun 21 18:16:50 2006 New Revision: 22459 URL: http://svn.reactos.ru/svn/reactos?rev=22459&view=rev Log: - Sync user32/buttons.c with Wine - Update wine-syncs doc Modified: trunk/reactos/dll/win32/user32/controls/button.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/user32/controls/button.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/user32/controls/b… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/button.c (original) +++ trunk/reactos/dll/win32/user32/controls/button.c Wed Jun 21 18:16:50 2006 @@ -16,16 +16,61 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + * NOTES + * + * This code was audited for completeness against the documented features + * of Comctl32.dll version 6.0 on Oct. 3, 2004, by Dimitrie O. Paun. + * + * Unless otherwise noted, we believe this code to be complete, as per + * the specification mentioned above. + * If you discover missing features, or bugs, please note them below. + * + * TODO + * Styles + * - BS_NOTIFY: is it complete? + * - BS_RIGHTBUTTON: same as BS_LEFTTEXT + * - BS_TYPEMASK + * + * Messages + * - WM_CHAR: Checks a (manual or automatic) check box on '+' or '=', clears it on '-' key. + * - WM_SETFOCUS: For (manual or automatic) radio buttons, send the parent window BN_CLICKED + * - WM_NCCREATE: Turns any BS_OWNERDRAW button into a BS_PUSHBUTTON button. + * - WM_SYSKEYUP + * - BCM_GETIDEALSIZE + * - BCM_GETIMAGELIST + * - BCM_GETTEXTMARGIN + * - BCM_SETIMAGELIST + * - BCM_SETTEXTMARGIN + * + * Notifications + * - BCN_HOTITEMCHANGE + * - BN_DISABLE + * - BN_PUSHED/BN_HILITE + * + BN_KILLFOCUS: is it OK? + * - BN_PAINT + * + BN_SETFOCUS: is it OK? + * - BN_UNPUSHED/BN_UNHILITE + * - NM_CUSTOMDRAW + * + * Structures/Macros/Definitions + * - BUTTON_IMAGELIST + * - NMBCHOTITEM + * - Button_GetIdealSize + * - Button_GetImageList + * - Button_GetTextMargin + * - Button_SetImageList + * - Button_SetTextMargin + */ +#define NDEBUG // turn off TRACEs #include <user32.h> /* GetWindowLong offsets for window extra information */ #define STATE_GWL_OFFSET 0 #define HFONT_GWL_OFFSET (sizeof(LONG)) -#define HIMAGE_GWL_OFFSET (HFONT_GWL_OFFSET*sizeof(LONG)) -#define NB_EXTRA_BYTES (HIMAGE_GWL_OFFSET*sizeof(LONG)) +#define HIMAGE_GWL_OFFSET (HFONT_GWL_OFFSET+sizeof(HFONT)) +#define NB_EXTRA_BYTES (HIMAGE_GWL_OFFSET+sizeof(HANDLE)) /* Button state values */ #define BUTTON_UNCHECKED 0x00 @@ -139,7 +184,7 @@ __inline static void set_button_font( HWND hwnd, HFONT font ) { - SetWindowLongPtrW( hwnd, HFONT_GWL_OFFSET, (LONG)font ); + SetWindowLongPtrW( hwnd, HFONT_GWL_OFFSET, (LONG_PTR)font ); } __inline static UINT get_button_type( LONG window_style ) @@ -308,6 +353,7 @@ break; case WM_CAPTURECHANGED: + TRACE("WM_CAPTURECHANGED %p\n", hWnd); state = get_button_state( hWnd ); if (state & BUTTON_BTNPRESSED) { @@ -367,6 +413,7 @@ return (LRESULT)get_button_font( hWnd ); case WM_SETFOCUS: + TRACE("WM_SETFOCUS %p\n",hWnd); set_button_state( hWnd, get_button_state(hWnd) | BUTTON_HASFOCUS ); paint_button( hWnd, btn_type, ODA_FOCUS ); if (style & BS_NOTIFY) @@ -374,6 +421,7 @@ break; case WM_KILLFOCUS: + TRACE("WM_KILLFOCUS %p\n",hWnd); state = get_button_state( hWnd ); set_button_state( hWnd, state & ~BUTTON_HASFOCUS ); paint_button( hWnd, btn_type, ODA_FOCUS ); @@ -818,7 +866,6 @@ SelectObject( hDC, hOldBrush ); SetBkMode(hDC, oldBkMode); } - /********************************************************************** * Check Box & Radio Button Functions @@ -1053,6 +1100,7 @@ DrawFocusRect( hDC, &rc ); } + /********************************************************************** * Ownerdrawn Button Functions */ Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=2… ============================================================================== --- trunk/reactos/media/doc/README.WINE (original) +++ trunk/reactos/media/doc/README.WINE Wed Jun 21 18:16:50 2006 @@ -114,7 +114,7 @@ reactos/dll/win32/msvcrt/wine/*.c # Out of sync User32 - - reactos/dll/win32/user32/controls/button.c # Out of sync + reactos/dll/win32/user32/controls/button.c # Synced at 20060621 reactos/dll/win32/user32/controls/edit.c # Out of sync reactos/dll/win32/user32/controls/static.c # Out of sync reactos/dll/win32/user32/misc/wsprintf.c # Out of sync

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