Ros-diffs June 2006

ros-diffs@reactos.org

19 participants
595 discussions

[cwittich] 22483: -added "MB" to clarify the image size

by cwittich＠svn.reactos.org

Author: cwittich Date: Wed Jun 21 23:42:29 2006 New Revision: 22483 URL: http://svn.reactos.ru/svn/reactos?rev=22483&view=rev Log: -added "MB" to clarify the image size Modified: trunk/tools/Qemu GUI/Qemu GUI.suo trunk/tools/Qemu GUI/frmMain.cs 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 23:42:29 2006 @@ -56,7 +56,7 @@ private System.Windows.Forms.Button btnLaunch; private System.Windows.Forms.GroupBox groupBox9; private System.Windows.Forms.Button btnCreateImage; - private System.Windows.Forms.Label label12; + private System.Windows.Forms.Label lblImageSize; private System.Windows.Forms.TextBox txtImageSize; private System.Windows.Forms.TabPage tabNetwork; private System.Windows.Forms.TabPage tabDebug; @@ -126,6 +126,7 @@ private TextBox txtVDKImage; private ComboBox cboVDKDrive; private ComboBox cboMachine; + private Label lblImageSizeMB; private QEmu qemu; public frmMain() @@ -224,7 +225,7 @@ this.groupBox9 = new System.Windows.Forms.GroupBox(); this.label11 = new System.Windows.Forms.Label(); this.txtImageSize = new System.Windows.Forms.TextBox(); - this.label12 = new System.Windows.Forms.Label(); + this.lblImageSize = new System.Windows.Forms.Label(); this.btnCreateImage = new System.Windows.Forms.Button(); this.cboImageFormat = new System.Windows.Forms.ComboBox(); this.tabAudio = new System.Windows.Forms.TabPage(); @@ -272,6 +273,7 @@ this.saveFileDialog1 = new System.Windows.Forms.SaveFileDialog(); this.btnLoad = new System.Windows.Forms.Button(); this.btnSave = new System.Windows.Forms.Button(); + this.lblImageSizeMB = new System.Windows.Forms.Label(); this.grpMachine.SuspendLayout(); this.HardDisk2.SuspendLayout(); this.tabMisc.SuspendLayout(); @@ -937,9 +939,10 @@ // // groupBox9 // + this.groupBox9.Controls.Add(this.lblImageSizeMB); this.groupBox9.Controls.Add(this.label11); this.groupBox9.Controls.Add(this.txtImageSize); - this.groupBox9.Controls.Add(this.label12); + this.groupBox9.Controls.Add(this.lblImageSize); this.groupBox9.Controls.Add(this.btnCreateImage); this.groupBox9.Controls.Add(this.cboImageFormat); this.groupBox9.Location = new System.Drawing.Point(4, 3); @@ -951,7 +954,7 @@ // // label11 // - this.label11.Location = new System.Drawing.Point(96, 24); + this.label11.Location = new System.Drawing.Point(125, 24); this.label11.Name = "label11"; this.label11.Size = new System.Drawing.Size(48, 12); this.label11.TabIndex = 5; @@ -965,17 +968,17 @@ this.txtImageSize.TabIndex = 3; this.txtImageSize.Text = "512"; // - // label12 - // - this.label12.Location = new System.Drawing.Point(13, 24); - this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(64, 24); - this.label12.TabIndex = 2; - this.label12.Text = "Image Size"; + // lblImageSize + // + this.lblImageSize.Location = new System.Drawing.Point(13, 24); + this.lblImageSize.Name = "lblImageSize"; + this.lblImageSize.Size = new System.Drawing.Size(64, 24); + this.lblImageSize.TabIndex = 2; + this.lblImageSize.Text = "Size"; // // btnCreateImage // - this.btnCreateImage.Location = new System.Drawing.Point(190, 36); + this.btnCreateImage.Location = new System.Drawing.Point(201, 36); this.btnCreateImage.Name = "btnCreateImage"; this.btnCreateImage.Size = new System.Drawing.Size(93, 23); this.btnCreateImage.TabIndex = 1; @@ -991,7 +994,7 @@ "qcow", "raw", "vmdk"}); - this.cboImageFormat.Location = new System.Drawing.Point(99, 39); + this.cboImageFormat.Location = new System.Drawing.Point(128, 39); this.cboImageFormat.Name = "cboImageFormat"; this.cboImageFormat.Size = new System.Drawing.Size(56, 21); this.cboImageFormat.TabIndex = 7; @@ -1411,6 +1414,15 @@ this.btnSave.TabIndex = 6; this.btnSave.Text = "Save"; this.btnSave.Click += new System.EventHandler(this.btnSave_Click); + // + // lblImageSizeMB + // + this.lblImageSizeMB.AutoSize = true; + this.lblImageSizeMB.Location = new System.Drawing.Point(83, 42); + this.lblImageSizeMB.Name = "lblImageSizeMB"; + this.lblImageSizeMB.Size = new System.Drawing.Size(23, 13); + this.lblImageSizeMB.TabIndex = 8; + this.lblImageSizeMB.Text = "MB"; // // frmMain //

18 years, 4 months

[greatlrd] 22482: compile new version, christ have implement vdk menu now, so u can mount and unmount images.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Wed Jun 21 23:16:08 2006 New Revision: 22482 URL: http://svn.reactos.ru/svn/reactos?rev=22482&view=rev Log: compile new version, christ have implement vdk menu now, so u can mount and unmount images. Modified: trunk/tools/Qemu GUI/bin/Release/Qemu GUI.exe 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

[cwittich] 22481: -added VDK stuff

by cwittich＠svn.reactos.org

Author: cwittich Date: Wed Jun 21 22:59:49 2006 New Revision: 22481 URL: http://svn.reactos.ru/svn/reactos?rev=22481&view=rev Log: -added VDK stuff 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=22481&… ============================================================================== --- trunk/tools/Qemu GUI/QEmu.cs (original) +++ trunk/tools/Qemu GUI/QEmu.cs Wed Jun 21 22:59:49 2006 @@ -30,6 +30,7 @@ private Debug m_Debug = new Debug(); private Paths m_Paths = new Paths(); private CDROM m_CDROM = new CDROM(); + private Tools m_Tools = new Tools(); private string m_LastError = ""; public QEmu() @@ -71,6 +72,55 @@ return m_LastError; } + public bool MountImage() + { + Process p = new Process(); + p.StartInfo.FileName = this.Paths.VDK + "\\vdk.exe"; + p.StartInfo.WorkingDirectory = this.Paths.VDK; + p.StartInfo.Arguments = "open * " + "\"" + this.Tools.vdk.Image + "\"" + @" /RW /L:" + this.Tools.vdk.DriveLetter.Substring(0, 1); + Console.WriteLine(p.StartInfo.Arguments); + p.StartInfo.RedirectStandardOutput = true; + p.StartInfo.UseShellExecute = false; + p.StartInfo.CreateNoWindow = true; + try + { + p.Start(); + m_LastError = p.StandardOutput.ReadToEnd(); + if (m_LastError.Length > 0) + return false; + } + catch + { + m_LastError = "vdk not found!"; + return false; + } + return true; + } + + public bool UnmountImage() + { + Process p = new Process(); + p.StartInfo.FileName = this.Paths.VDK + "\\vdk.exe"; + p.StartInfo.WorkingDirectory = this.Paths.VDK; + p.StartInfo.Arguments = "CLOSE * /F"; + p.StartInfo.RedirectStandardError = true; + p.StartInfo.UseShellExecute = false; + p.StartInfo.CreateNoWindow = true; + try + { + p.Start(); + m_LastError = p.StandardError.ReadToEnd(); + if (m_LastError.Length > 0) + return false; + } + catch + { + m_LastError = "vdk not found!"; + return false; + } + return true; + } + public bool Start(Platforms Platform) { Process p = new Process(); @@ -117,6 +167,13 @@ { get { return m_Misc; } set { this.m_Misc = value; } + } + + [XmlElement("Tools")] + public Tools Tools + { + get { return m_Tools; } + set { this.m_Tools = value; } } [XmlElement("Floppies")] @@ -350,6 +407,34 @@ } } + public class Tools + { + private VDK m_VDK = new VDK(); + + [XmlElement("VDK")] + public VDK vdk + { + get { return this.m_VDK; } + set { this.m_VDK = value; } + } + + public Tools() + { + } + } + + public class VDK + { + [XmlElement("Image")] + public string Image = ""; + [XmlElement("DriveLetter")] + public string DriveLetter = ""; + + public VDK() + { + } + } + public class Audio { [XmlElement("Soundblaster")] 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 22:59:49 2006 @@ -910,21 +910,21 @@ // // btnUnmount // - this.btnUnmount.Enabled = false; this.btnUnmount.Location = new System.Drawing.Point(353, 77); this.btnUnmount.Name = "btnUnmount"; this.btnUnmount.Size = new System.Drawing.Size(93, 23); this.btnUnmount.TabIndex = 5; this.btnUnmount.Text = "Unmount"; + this.btnUnmount.Click += new System.EventHandler(this.btnUnmount_Click); // // btnMount // - this.btnMount.Enabled = false; this.btnMount.Location = new System.Drawing.Point(255, 77); this.btnMount.Name = "btnMount"; this.btnMount.Size = new System.Drawing.Size(93, 23); this.btnMount.TabIndex = 3; this.btnMount.Text = "Mount"; + this.btnMount.Click += new System.EventHandler(this.btnMount_Click); // // lblImage // @@ -1874,8 +1874,11 @@ chkSerialToFile.Checked = qemu.Debug.SerialPort.Redirect; chkParallelToFile.Checked = qemu.Debug.ParallelPort.Redirect; chkVBE30.Checked = qemu.Debug.VBE3; - txtGDBPort.Text = qemu.Debug.GDBPort.ToString(); - + txtGDBPort.Text = qemu.Debug.GDBPort.ToString(); + + /* Tools */ + txtVDKImage.Text = qemu.Tools.vdk.Image; + cboVDKDrive.Text = qemu.Tools.vdk.DriveLetter; } private void SaveSettings() @@ -1927,6 +1930,10 @@ qemu.Debug.ParallelPort.Redirect = chkParallelToFile.Checked; qemu.Debug.VBE3 = chkVBE30.Checked; qemu.Debug.GDBPort = Int32.Parse(txtGDBPort.Text); + + /* Tools */ + qemu.Tools.vdk.Image = txtVDKImage.Text; + qemu.Tools.vdk.DriveLetter = cboVDKDrive.Text; } #endregion @@ -1940,6 +1947,27 @@ } } + private void btnUnmount_Click(object sender, EventArgs e) + { + if (!qemu.UnmountImage()) + { + frmError fError = new frmError(); + fError.txtError.Text = qemu.GetLastError(); + fError.ShowDialog(this); + } + } + + private void btnMount_Click(object sender, EventArgs e) + { + SaveSettings(); + if (!qemu.MountImage()) + { + frmError fError = new frmError(); + fError.txtError.Text = qemu.GetLastError(); + fError.ShowDialog(this); + } + } +

18 years, 4 months

[gedmurphy] 22480: change macros to call correct version

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Wed Jun 21 22:46:46 2006 New Revision: 22480 URL: http://svn.reactos.ru/svn/reactos?rev=22480&view=rev Log: change macros to call correct version Modified: trunk/reactos/dll/cpl/timedate/timedate.c trunk/reactos/dll/win32/syssetup/wizard.c Modified: trunk/reactos/dll/cpl/timedate/timedate.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/timedate.c… ============================================================================== --- trunk/reactos/dll/cpl/timedate/timedate.c (original) +++ trunk/reactos/dll/cpl/timedate/timedate.c Wed Jun 21 22:46:46 2006 @@ -124,7 +124,7 @@ { SYSTEMTIME Time; - if (DateTime_GetSystemTime(GetDlgItem(hwnd, + if (DateTime_GetSystemtime(GetDlgItem(hwnd, IDC_TIMEPICKER), &Time) == GDT_VALID && SendMessage(GetDlgItem(hwnd, Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.c… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c Wed Jun 21 22:46:46 2006 @@ -1133,7 +1133,7 @@ return FALSE; } - if (DateTime_GetSystemTime(GetDlgItem(hwnd, IDC_TIMEPICKER), &Time) != GDT_VALID) + if (DateTime_GetSystemtime(GetDlgItem(hwnd, IDC_TIMEPICKER), &Time) != GDT_VALID) { return FALSE; }

18 years, 4 months

[gedmurphy] 22479: fix incorrect macro

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Wed Jun 21 22:43:14 2006 New Revision: 22479 URL: http://svn.reactos.ru/svn/reactos?rev=22479&view=rev Log: fix incorrect macro Modified: trunk/reactos/include/commctrl.h Modified: trunk/reactos/include/commctrl.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/include/commctrl.h?rev=2247… ============================================================================== --- trunk/reactos/include/commctrl.h (original) +++ trunk/reactos/include/commctrl.h Wed Jun 21 22:43:14 2006 @@ -2970,7 +2970,7 @@ #define DateTime_GetMonthCalColor(hwnd, icolor) SNDMSG(hwnd, DTM_GETMONTHCAL, (WPARAM)icolor,0) #define DateTime_GetMonthCalFont(hwnd) SNDMSG(hwnd,DTM_GETMCFONT,0,0) #define DateTime_GetRange(hwnd,lpsystimearray) SNDMSG(hwnd,DTM_GETRANGE,0,(LPARAM)lpsystimearray) -#define DateTime_GetSystemTime(hwnd,lpsystime) SNDMSG(hwnd,DTM_GETSYSTEMTIME,0,(LPARAM)lpsystime) +#define DateTime_GetSystemtime(hwnd,lpsystime) SNDMSG(hwnd,DTM_GETSYSTEMTIME,0,(LPARAM)lpsystime) #define DateTime_SetFormat(hwnd,lpszformat) SNDMSG(hwnd,DTM_SETFORMAT,0,(LPARAM)lpszformat) #define DateTime_SetMonthCalColor(hwnd,icolor,clr) SNDMSG(hwnd,DTM_SETMCCOLOR,(WPARAM)icolor,(LPARAM)clr) #define DateTime_SetMonthCalFont(hwnd,hfont,lparam) SNDMSG(hwnd,DTM_SETMCFONT,(WPARAM)hfont,(LPARAM)lparam)

18 years, 4 months

[cwittich] 22478: -display free drive letters in VDK combobox

by cwittich＠svn.reactos.org

Author: cwittich Date: Wed Jun 21 22:23:20 2006 New Revision: 22478 URL: http://svn.reactos.ru/svn/reactos?rev=22478&view=rev Log: -display free drive letters in VDK combobox Modified: trunk/tools/Qemu GUI/Qemu GUI.suo trunk/tools/Qemu GUI/frmMain.cs 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 22:23:20 2006 @@ -330,7 +330,6 @@ 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 // @@ -907,6 +906,7 @@ this.btnVDKImage.TabIndex = 8; this.btnVDKImage.Text = "..."; this.btnVDKImage.UseVisualStyleBackColor = true; + this.btnVDKImage.Click += new System.EventHandler(this.btnVDKImage_Click); // // btnUnmount // @@ -1393,10 +1393,6 @@ // this.openFile.Title = "Path to VDK"; this.openFile.ValidateNames = false; - // - // folderBrowserDialog1 - // - this.folderBrowserDialog1.HelpRequest += new System.EventHandler(this.folderBrowserDialog1_HelpRequest); // // btnLoad // @@ -1710,13 +1706,26 @@ { qemu = new QEmu(); + /* Fill a list with possible free driveletters */ + ArrayList DriveLetters = new ArrayList(); + for (int i = 100; i < 123; i++) + { + DriveLetters.Add(Convert.ToChar(i).ToString().ToUpper() + @":\"); + } + DriveInfo[] drives = DriveInfo.GetDrives(); foreach (DriveInfo drive in drives) { + /* remove all driveletters which are in use */ + DriveLetters.Remove(drive.RootDirectory.ToString()); if (drive.DriveType == DriveType.CDRom) cboCDROM.Items.Add(drive.RootDirectory); } + foreach (object o in DriveLetters) + cboVDKDrive.Items.Add(o); + + cboVDKDrive.SelectedIndex = 0; cboCDROM.SelectedIndex = 0; cboBootFrom.SelectedIndex = 1; cboImageFormat.SelectedIndex = 4; @@ -1922,15 +1931,13 @@ #endregion - private void folderBrowserDialog1_HelpRequest(object sender, EventArgs e) - { - - } - - private void cboMachineFrom_SelectedIndexChanged(object sender, EventArgs e) - { - - + private void btnVDKImage_Click(object sender, EventArgs e) + { + openFile.Filter = "VMWare Images (*.vmdk)|*.vmdk"; + if (openFile.ShowDialog() == DialogResult.OK) + { + txtVDKImage.Text = openFile.FileName; + } }

18 years, 4 months

[greatlrd] 22477: changing VGA Dispaly Output off to VGA Dispaly Off to make it more clear

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Wed Jun 21 21:43:35 2006 New Revision: 22477 URL: http://svn.reactos.ru/svn/reactos?rev=22477&view=rev Log: changing VGA Dispaly Output off to VGA Dispaly Off to make it more clear 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 21:43:35 2006 @@ -529,9 +529,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(136, 17); + this.chkVGAoutput.Size = new System.Drawing.Size(105, 17); this.chkVGAoutput.TabIndex = 20; - this.chkVGAoutput.Text = " VGA Display output off"; + this.chkVGAoutput.Text = " VGA Display Off"; this.chkVGAoutput.UseVisualStyleBackColor = true; // // chkFullscreen

18 years, 4 months

[cwittich] 22476: -removed some debug code

by cwittich＠svn.reactos.org

Author: cwittich Date: Wed Jun 21 21:38:27 2006 New Revision: 22476 URL: http://svn.reactos.ru/svn/reactos?rev=22476&view=rev Log: -removed some debug code 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=22476&… ============================================================================== --- trunk/tools/Qemu GUI/QEmu.cs (original) +++ trunk/tools/Qemu GUI/QEmu.cs Wed Jun 21 21:38:27 2006 @@ -171,8 +171,6 @@ arg += CDROM.ToString(); arg += Audio.ToString(); arg += Debug.ToString(); - - Console.WriteLine(arg); return arg; } @@ -388,8 +386,6 @@ if (this.ES1370) buffer += "es1370,"; - - Console.WriteLine(buffer.Substring(0, buffer.Length - 1) + " "); return buffer.Substring(0, buffer.Length - 1) + " "; }

18 years, 4 months

[cwittich] 22475: -added Platforms enum to prevent comparing strings

by cwittich＠svn.reactos.org

Author: cwittich Date: Wed Jun 21 21:36:39 2006 New Revision: 22475 URL: http://svn.reactos.ru/svn/reactos?rev=22475&view=rev Log: -added Platforms enum to prevent comparing strings 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=22475&… ============================================================================== --- trunk/tools/Qemu GUI/QEmu.cs (original) +++ trunk/tools/Qemu GUI/QEmu.cs Wed Jun 21 21:36:39 2006 @@ -9,9 +9,20 @@ namespace Qemu_GUI { + public enum Platforms + { + x86 = 0, + x86_ISA, + x64, + x64_ISA + } + [XmlRoot("Settings")] public class QEmu : IDisposable { + + + private Misc m_Misc = new Misc(); private Floppies m_Floppies = new Floppies(); private Harddisks m_Harddisks = new Harddisks(); @@ -60,19 +71,26 @@ return m_LastError; } - public bool Start(string platfrom) + public bool Start(Platforms Platform) { Process p = new Process(); - 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"; - + switch (Platform) + { + case Platforms.x86: + p.StartInfo.FileName = this.Paths.QEmu + "\\qemu.exe"; + break; + case Platforms.x86_ISA: + p.StartInfo.FileName = this.Paths.QEmu + "\\qemu-system-x86_64.exe"; + break; + case Platforms.x64: + p.StartInfo.FileName = this.Paths.QEmu + "\\qemu.exe"; + break; + case Platforms.x64_ISA: + p.StartInfo.FileName = this.Paths.QEmu + "\\qemu-system-x86_64.exe"; + break; + } + p.StartInfo.WorkingDirectory = this.Paths.QEmu; p.StartInfo.Arguments = GetArgv(); p.StartInfo.RedirectStandardError = true; @@ -179,7 +197,6 @@ { if (this.HDD[i].Enabled && (this.HDD[i].Path.Length > 0)) buffer += "-hd" + Convert.ToChar('a' + i) + " \"" + this.HDD[i].Path + "\" "; - } return buffer; } @@ -254,7 +271,7 @@ public class Misc { [XmlElement("Machine")] - public string Machine; + public Platforms Machine; [XmlElement("Memory")] public int Memory; [XmlElement("CPUs")] @@ -295,15 +312,21 @@ buffer += "-no-kqemu "; /* Machine settings */ - if (this.Machine == "Standard PC 32Bits") - buffer += "-M 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 "; - + switch (this.Machine) + { + case Platforms.x86: + buffer += "-M pc "; + break; + case Platforms.x86_ISA: + buffer += "-M isapc "; + break; + case Platforms.x64: + buffer += "-M pc "; + break; + case Platforms.x64_ISA: + buffer += "-M isapc "; + break; + } /* 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/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 21:36:39 2006 @@ -319,12 +319,13 @@ // cboMachine // this.cboMachine.DisplayMember = "1"; + this.cboMachine.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cboMachine.FormattingEnabled = true; this.cboMachine.Items.AddRange(new object[] { - "Standard PC 32Bits", - "ISA only PC 32Bits", - "Standard PC 64Bits", - "ISA only PC 64Bits"}); + "Standard PC 32Bit", + "ISA only PC 32Bit", + "Standard PC 64Bit", + "ISA only PC 64Bit"}); this.cboMachine.Location = new System.Drawing.Point(19, 19); this.cboMachine.Name = "cboMachine"; this.cboMachine.Size = new System.Drawing.Size(239, 21); @@ -1660,7 +1661,7 @@ private void btnLaunch_Click(object sender, System.EventArgs e) { SaveSettings(); - if (!qemu.Start(cboMachine.SelectedItem.ToString())) + if (!qemu.Start((Platforms)cboMachine.SelectedIndex)) { frmError fError = new frmError(); fError.txtError.Text = qemu.GetLastError(); @@ -1817,7 +1818,7 @@ private void LoadSettings() { /* Misc */ - cboMachine.Text = qemu.Misc.Machine; + cboMachine.SelectedIndex = (int) qemu.Misc.Machine; numMemory.Value = qemu.Misc.Memory; numSMP.Value = qemu.Misc.CPUs; cboBootFrom.Text = qemu.Misc.BootFrom; @@ -1871,7 +1872,7 @@ private void SaveSettings() { /* Misc */ - qemu.Misc.Machine = cboMachine.SelectedText; + qemu.Misc.Machine = (Platforms) cboMachine.SelectedIndex; qemu.Misc.Memory = (int) numMemory.Value; qemu.Misc.CPUs = (int) numSMP.Value; qemu.Misc.BootFrom = cboBootFrom.Text;

18 years, 4 months

[greatlrd] 22474: fixing the hd bug, this code is working both on windows 2k and xp, but it still contain some regress some other place

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Wed Jun 21 21:25:53 2006 New Revision: 22474 URL: http://svn.reactos.ru/svn/reactos?rev=22474&view=rev Log: fixing the hd bug, this code is working both on windows 2k and xp, but it still contain some regress some other place Modified: trunk/tools/Qemu GUI/QEmu.cs trunk/tools/Qemu GUI/Qemu GUI.suo 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=22474&… ============================================================================== --- trunk/tools/Qemu GUI/QEmu.cs (original) +++ trunk/tools/Qemu GUI/QEmu.cs Wed Jun 21 21:25:53 2006 @@ -178,9 +178,9 @@ for (int i = 0; i < 4; i++) { if (this.HDD[i].Enabled && (this.HDD[i].Path.Length > 0)) - buffer += String.Format(@"-hd{0} ""{1}""", (char) ('a' + i), this.HDD[i].Path); - } - Console.WriteLine(buffer); + buffer += "-hd" + Convert.ToChar('a' + i) + " \"" + this.HDD[i].Path + "\" "; + + } 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/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

← Newer
1
...
23
24
25
26
27
28
29
...
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