Ros-diffs June 2006

ros-diffs@reactos.org

19 participants
595 discussions

[fireball] 22473: Update the doc to include all user32.dll's source code files which are shared one way or another with Wine. Makes syncing easier.

by fireball＠svn.reactos.org

Author: fireball Date: Wed Jun 21 21:03:20 2006 New Revision: 22473 URL: http://svn.reactos.ru/svn/reactos?rev=22473&view=rev Log: Update the doc to include all user32.dll's source code files which are shared one way or another with Wine. Makes syncing easier. Modified: trunk/reactos/media/doc/README.WINE 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 21:03:20 2006 @@ -115,10 +115,30 @@ User32 - reactos/dll/win32/user32/controls/button.c # Synced at 20060621 + reactos/dll/win32/user32/controls/combo.c # Last sync date unknown reactos/dll/win32/user32/controls/edit.c # Out of sync + reactos/dll/win32/user32/controls/icontitle.c # Last sync date unknown + reactos/dll/win32/user32/controls/listbox.c # Out of sync + reactos/dll/win32/user32/controls/scrollbar.c # Forked (?) reactos/dll/win32/user32/controls/static.c # Out of sync + + reactos/dll/win32/user32/misc/dde.c # Last sync date unknown (dde_misc.c) + reactos/dll/win32/user32/misc/ddeclient.c # Last sync date unknown + reactos/dll/win32/user32/misc/ddeserver.c # Last sync date unknown + reactos/dll/win32/user32/misc/exticon.c # Last sync date unknown + reactos/dll/win32/user32/misc/resources.c # Forked? + reactos/dll/win32/user32/misc/winhelp.c # Last sync date unknown reactos/dll/win32/user32/misc/wsprintf.c # Out of sync + + reactos/dll/win32/user32/windows/draw.c # Forked at Wine-20020904 (uitools.c) reactos/dll/win32/user32/windows/mdi.c # Out of sync + reactos/dll/win32/user32/windows/menu.c # Last sync date unknown + reactos/dll/win32/user32/windows/messagebox.c # Forked + reactos/dll/win32/user32/windows/rect.c # Forked (uitools.c) + reactos/dll/win32/user32/windows/text.c # Forked (lstr.c) + reactos/dll/win32/user32/windows/winpos.c # Forked + +Update process for shared DLLs - Cd to the parent directory of your top-level "reactos" directory - Check out the Wine release: "cvs -d :pserver:cvs@cvs.winehq.com:2401/home/wine co wine -r Wine-20050211"

18 years, 4 months

[cwittich] 22472: fixed another small bug

by cwittich＠svn.reactos.org

Author: cwittich Date: Wed Jun 21 20:57:25 2006 New Revision: 22472 URL: http://svn.reactos.ru/svn/reactos?rev=22472&view=rev Log: fixed another small bug 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=22472&… ============================================================================== --- trunk/tools/Qemu GUI/QEmu.cs (original) +++ trunk/tools/Qemu GUI/QEmu.cs Wed Jun 21 20:57:25 2006 @@ -365,6 +365,8 @@ if (this.ES1370) buffer += "es1370,"; + + Console.WriteLine(buffer.Substring(0, buffer.Length - 1) + " "); return buffer.Substring(0, buffer.Length - 1) + " "; } @@ -402,7 +404,7 @@ if (this.VBE3) buffer += "-std-vga "; - if (this.GDBPort != "1234") + if (this.GDBPort != 1234) buffer += "-p " + this.GDBPort.ToString() + " "; return buffer;

18 years, 4 months

[cwittich] 22471: -fixed some bugs -added GDBPort to Debug Class

by cwittich＠svn.reactos.org

Author: cwittich Date: Wed Jun 21 20:56:05 2006 New Revision: 22471 URL: http://svn.reactos.ru/svn/reactos?rev=22471&view=rev Log: -fixed some bugs -added GDBPort to Debug Class 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=22471&… ============================================================================== --- trunk/tools/Qemu GUI/QEmu.cs (original) +++ trunk/tools/Qemu GUI/QEmu.cs Wed Jun 21 20:56:05 2006 @@ -34,8 +34,8 @@ long d = Size * 1024; 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); + p.StartInfo.FileName = this.Paths.QEmu + "\\" + "qemu-img.exe"; + p.StartInfo.WorkingDirectory = this.Paths.QEmu; p.StartInfo.Arguments = argv; p.StartInfo.RedirectStandardError = true; p.StartInfo.UseShellExecute = false; @@ -64,16 +64,16 @@ { Process p = new Process(); - if (platfrom == "Standard PC 32Bits") - p.StartInfo.FileName = this.Paths.QEmu+"\\qemu.exe"; - if (platfrom == "Standard PC 64Bits") - p.StartInfo.FileName = this.Paths.QEmu+"\\qemu-system-x86_64.exe"; - if (platfrom == "ISA only PC 32Bits") - p.StartInfo.FileName = this.Paths.QEmu+"\\qemu.exe"; - if (platfrom == "ISA only PC 64Bits") + if (platfrom == "Standard PC 32Bit") + p.StartInfo.FileName = this.Paths.QEmu + "\\qemu.exe"; + if (platfrom == "Standard PC 64Bit") + p.StartInfo.FileName = this.Paths.QEmu + "\\qemu-system-x86_64.exe"; + if (platfrom == "ISA only PC 32Bit") + p.StartInfo.FileName = this.Paths.QEmu + "\\qemu.exe"; + if (platfrom == "ISA only PC 64Bit") p.StartInfo.FileName = this.Paths.QEmu + "\\qemu-system-x86_64.exe"; - p.StartInfo.WorkingDirectory = Path.GetDirectoryName(this.Paths.QEmu); + p.StartInfo.WorkingDirectory = this.Paths.QEmu; p.StartInfo.Arguments = GetArgv(); p.StartInfo.RedirectStandardError = true; p.StartInfo.UseShellExecute = false; @@ -377,6 +377,8 @@ [XmlElement("VBE3")] public bool VBE3; + [XmlElement("GDBPort")] + public int GDBPort; public override string ToString() { @@ -399,6 +401,9 @@ /* Standard VGA */ if (this.VBE3) buffer += "-std-vga "; + + if (this.GDBPort != "1234") + buffer += "-p " + this.GDBPort.ToString() + " "; return buffer; } 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 20:56:05 2006 @@ -125,7 +125,7 @@ private Label lblImage; private TextBox txtVDKImage; private ComboBox cboVDKDrive; - private ComboBox cboMachineFrom; + private ComboBox cboMachine; private QEmu qemu; public frmMain() @@ -164,7 +164,7 @@ { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain)); this.grpMachine = new System.Windows.Forms.GroupBox(); - this.cboMachineFrom = new System.Windows.Forms.ComboBox(); + this.cboMachine = new System.Windows.Forms.ComboBox(); this.HardDisk2 = new System.Windows.Forms.TabControl(); this.tabMisc = new System.Windows.Forms.TabPage(); this.groupBox6 = new System.Windows.Forms.GroupBox(); @@ -308,7 +308,7 @@ // // grpMachine // - this.grpMachine.Controls.Add(this.cboMachineFrom); + this.grpMachine.Controls.Add(this.cboMachine); this.grpMachine.Location = new System.Drawing.Point(3, 3); this.grpMachine.Name = "grpMachine"; this.grpMachine.Size = new System.Drawing.Size(274, 48); @@ -316,20 +316,20 @@ this.grpMachine.TabStop = false; this.grpMachine.Text = "Machine"; // - // cboMachineFrom - // - this.cboMachineFrom.DisplayMember = "1"; - this.cboMachineFrom.FormattingEnabled = true; - this.cboMachineFrom.Items.AddRange(new object[] { + // cboMachine + // + this.cboMachine.DisplayMember = "1"; + this.cboMachine.FormattingEnabled = true; + this.cboMachine.Items.AddRange(new object[] { "Standard PC 32Bits", "ISA only PC 32Bits", "Standard PC 64Bits", "ISA only PC 64Bits"}); - 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.SelectedIndexChanged += new System.EventHandler(this.cboMachineFrom_SelectedIndexChanged); + this.cboMachine.Location = new System.Drawing.Point(19, 19); + this.cboMachine.Name = "cboMachine"; + this.cboMachine.Size = new System.Drawing.Size(239, 21); + this.cboMachine.TabIndex = 20; + this.cboMachine.SelectedIndexChanged += new System.EventHandler(this.cboMachineFrom_SelectedIndexChanged); // // HardDisk2 // @@ -1660,7 +1660,7 @@ private void btnLaunch_Click(object sender, System.EventArgs e) { SaveSettings(); - if (!qemu.Start(cboMachineFrom.SelectedItem.ToString())) + if (!qemu.Start(cboMachine.SelectedItem.ToString())) { frmError fError = new frmError(); fError.txtError.Text = qemu.GetLastError(); @@ -1676,11 +1676,6 @@ if (checkBox14.Checked == true) { arg = arg + "-s "; - } - - if (txtGDBPort.Text != "1234") - { - arg = arg + "-p "+txtGDBPort.Text+" "; } // qemu state @@ -1724,7 +1719,7 @@ cboCDROM.SelectedIndex = 0; cboBootFrom.SelectedIndex = 1; cboImageFormat.SelectedIndex = 4; - cboMachineFrom.SelectedIndex = 0; + cboMachine.SelectedIndex = 0; /* try to load config.xml from current directory */ try @@ -1771,8 +1766,6 @@ #region Paths private void btnQEmuPath_Click(object sender, EventArgs e) { - //openFile.Filter = "Executable files (*.exe)|*.exe"; - if (folderBrowserDialog1.ShowDialog() == DialogResult.OK) { txtQEmuPath.Text = folderBrowserDialog1.SelectedPath; @@ -1824,7 +1817,7 @@ private void LoadSettings() { /* Misc */ - cboMachineFrom.Text = qemu.Misc.Machine; + cboMachine.Text = qemu.Misc.Machine; numMemory.Value = qemu.Misc.Memory; numSMP.Value = qemu.Misc.CPUs; cboBootFrom.Text = qemu.Misc.BootFrom; @@ -1871,13 +1864,14 @@ chkSerialToFile.Checked = qemu.Debug.SerialPort.Redirect; chkParallelToFile.Checked = qemu.Debug.ParallelPort.Redirect; chkVBE30.Checked = qemu.Debug.VBE3; + txtGDBPort.Text = qemu.Debug.GDBPort.ToString(); } private void SaveSettings() { /* Misc */ - qemu.Misc.Machine = cboMachineFrom.SelectedText; + qemu.Misc.Machine = cboMachine.SelectedText; qemu.Misc.Memory = (int) numMemory.Value; qemu.Misc.CPUs = (int) numSMP.Value; qemu.Misc.BootFrom = cboBootFrom.Text; @@ -1922,6 +1916,7 @@ qemu.Debug.SerialPort.Redirect = chkSerialToFile.Checked; qemu.Debug.ParallelPort.Redirect = chkParallelToFile.Checked; qemu.Debug.VBE3 = chkVBE30.Checked; + qemu.Debug.GDBPort = Int32.Parse(txtGDBPort.Text); } #endregion

18 years, 4 months

[greatlrd] 22470: 1. Adding 64Bits support. 2. Use Qemu path not the file name. 3. fixing smaller bugs

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Wed Jun 21 20:35:00 2006 New Revision: 22470 URL: http://svn.reactos.ru/svn/reactos?rev=22470&view=rev Log: 1. Adding 64Bits support. 2. Use Qemu path not the file name. 3. fixing smaller bugs 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=22470&… ============================================================================== --- trunk/tools/Qemu GUI/QEmu.cs (original) +++ trunk/tools/Qemu GUI/QEmu.cs Wed Jun 21 20:35:00 2006 @@ -60,10 +60,19 @@ return m_LastError; } - public bool Start() + public bool Start(string platfrom) { Process p = new Process(); - p.StartInfo.FileName = this.Paths.QEmu; + + if (platfrom == "Standard PC 32Bits") + p.StartInfo.FileName = this.Paths.QEmu+"\\qemu.exe"; + if (platfrom == "Standard PC 64Bits") + p.StartInfo.FileName = this.Paths.QEmu+"\\qemu-system-x86_64.exe"; + if (platfrom == "ISA only PC 32Bits") + p.StartInfo.FileName = this.Paths.QEmu+"\\qemu.exe"; + if (platfrom == "ISA only PC 64Bits") + p.StartInfo.FileName = this.Paths.QEmu + "\\qemu-system-x86_64.exe"; + p.StartInfo.WorkingDirectory = Path.GetDirectoryName(this.Paths.QEmu); p.StartInfo.Arguments = GetArgv(); p.StartInfo.RedirectStandardError = true; @@ -79,7 +88,7 @@ } catch { - m_LastError = "qemu.exe not found!"; + m_LastError = "qemu not found!"; return false; } return true; @@ -136,7 +145,7 @@ private string GetArgv() { - string arg = "-L " + Path.GetDirectoryName(this.Paths.QEmu) + " "; + string arg = "-L " + this.Paths.QEmu + " "; arg += Misc.ToString(); arg += Floppies.ToString(); @@ -286,11 +295,15 @@ buffer += "-no-kqemu "; /* Machine settings */ - if (this.Machine == "Standard PC") + if (this.Machine == "Standard PC 32Bits") buffer += "-M pc "; - if (this.Machine == "ISA only PC") + if (this.Machine == "Standard PC 64Bits") + buffer += "-M pc "; + if (this.Machine == "ISA only PC 32Bits") buffer += "-M isapc "; - + if (this.Machine == "ISA only PC 64Bits") + buffer += "-M isapc "; + /* 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 20:35:00 2006 @@ -164,6 +164,7 @@ { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain)); this.grpMachine = new System.Windows.Forms.GroupBox(); + this.cboMachineFrom = new System.Windows.Forms.ComboBox(); this.HardDisk2 = new System.Windows.Forms.TabControl(); this.tabMisc = new System.Windows.Forms.TabPage(); this.groupBox6 = new System.Windows.Forms.GroupBox(); @@ -271,7 +272,6 @@ 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(); @@ -316,6 +316,21 @@ this.grpMachine.TabStop = false; this.grpMachine.Text = "Machine"; // + // cboMachineFrom + // + this.cboMachineFrom.DisplayMember = "1"; + this.cboMachineFrom.FormattingEnabled = true; + this.cboMachineFrom.Items.AddRange(new object[] { + "Standard PC 32Bits", + "ISA only PC 32Bits", + "Standard PC 64Bits", + "ISA only PC 64Bits"}); + 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.SelectedIndexChanged += new System.EventHandler(this.cboMachineFrom_SelectedIndexChanged); + // // HardDisk2 // this.HardDisk2.Controls.Add(this.tabMisc); @@ -367,6 +382,8 @@ // chkKQEmu // this.chkKQEmu.AutoSize = true; + this.chkKQEmu.Checked = true; + this.chkKQEmu.CheckState = System.Windows.Forms.CheckState.Checked; this.chkKQEmu.Location = new System.Drawing.Point(19, 106); this.chkKQEmu.Name = "chkKQEmu"; this.chkKQEmu.Size = new System.Drawing.Size(177, 17); @@ -1376,6 +1393,10 @@ this.openFile.Title = "Path to VDK"; this.openFile.ValidateNames = false; // + // folderBrowserDialog1 + // + this.folderBrowserDialog1.HelpRequest += new System.EventHandler(this.folderBrowserDialog1_HelpRequest); + // // btnLoad // this.btnLoad.Location = new System.Drawing.Point(12, 243); @@ -1393,18 +1414,6 @@ 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 // @@ -1651,7 +1660,7 @@ private void btnLaunch_Click(object sender, System.EventArgs e) { SaveSettings(); - if (!qemu.Start()) + if (!qemu.Start(cboMachineFrom.SelectedItem.ToString())) { frmError fError = new frmError(); fError.txtError.Text = qemu.GetLastError(); @@ -1715,6 +1724,7 @@ cboCDROM.SelectedIndex = 0; cboBootFrom.SelectedIndex = 1; cboImageFormat.SelectedIndex = 4; + cboMachineFrom.SelectedIndex = 0; /* try to load config.xml from current directory */ try @@ -1761,9 +1771,13 @@ #region Paths private void btnQEmuPath_Click(object sender, EventArgs e) { - openFile.Filter = "Executable files (*.exe)|*.exe"; - if (openFile.ShowDialog() == DialogResult.OK) - txtQEmuPath.Text = openFile.FileName; + //openFile.Filter = "Executable files (*.exe)|*.exe"; + + if (folderBrowserDialog1.ShowDialog() == DialogResult.OK) + { + txtQEmuPath.Text = folderBrowserDialog1.SelectedPath; + qemu.Paths.QEmu = txtQEmuPath.Text; + } } private void btnVDKBrowse_Click(object sender, EventArgs e) @@ -1912,6 +1926,17 @@ #endregion + private void folderBrowserDialog1_HelpRequest(object sender, EventArgs e) + { + + } + + private void cboMachineFrom_SelectedIndexChanged(object sender, EventArgs e) + { + + + } +

18 years, 4 months

[cwittich] 22469: reverted the hdd "fix" from "Great Lord of code duplication" and changed it to hpoussin's proposal

by cwittich＠svn.reactos.org

Author: cwittich Date: Wed Jun 21 20:23:42 2006 New Revision: 22469 URL: http://svn.reactos.ru/svn/reactos?rev=22469&view=rev Log: reverted the hdd "fix" from "Great Lord of code duplication" and changed it to hpoussin's proposal 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=22469&… ============================================================================== --- trunk/tools/Qemu GUI/QEmu.cs (original) +++ trunk/tools/Qemu GUI/QEmu.cs Wed Jun 21 20:23:42 2006 @@ -169,18 +169,9 @@ for (int i = 0; i < 4; i++) { if (this.HDD[i].Enabled && (this.HDD[i].Path.Length > 0)) - { - 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 + "\" "; - - } - } + buffer += String.Format(@"-hd{0} ""{1}""", (char) ('a' + i), this.HDD[i].Path); + } + Console.WriteLine(buffer); return buffer; }

18 years, 4 months

[cwittich] 22468: reverted GreatLords audio "fix" - it did not changed anything except the code was about 4 times longer

by cwittich＠svn.reactos.org

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

18 years, 4 months

[greatlrd] 22467: fixing cdrom setting so they working again

by greatlrd＠svn.reactos.org

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.

18 years, 4 months

[greatlrd] 22466: fixing audio setting so they are working again

by greatlrd＠svn.reactos.org

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.

18 years, 4 months

[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

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;

18 years, 4 months

[cwittich] 22464: bugfix: loading of harddisk images should work again

by cwittich＠svn.reactos.org

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; }

18 years, 4 months

← Newer
1
...
24
25
26
27
28
29
30
...
60
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2006