Ros-diffs June 2007

ros-diffs@reactos.org

21 participants
420 discussions

[gedmurphy] 27279: - implement deleting of existing images - add a few public properties for virtual machines
by gedmurphy＠svn.reactos.org 25 Jun '07

25 Jun '07

Author: gedmurphy Date: Tue Jun 26 02:48:23 2007 New Revision: 27279 URL: http://svn.reactos.org/svn/reactos?rev=27279&view=rev Log: - implement deleting of existing images - add a few public properties for virtual machines Modified: trunk/tools/RosTE/GUI/MainForm.cs trunk/tools/RosTE/GUI/VirtualMachine.cs Modified: trunk/tools/RosTE/GUI/MainForm.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/MainForm.cs?rev=27… ============================================================================== --- trunk/tools/RosTE/GUI/MainForm.cs (original) +++ trunk/tools/RosTE/GUI/MainForm.cs Tue Jun 26 02:48:23 2007 @@ -139,6 +139,12 @@ if (delFrm.ShowDialog() == DialogResult.OK) { + if (delFrm.DeleteFullVM) + { + VirtualMachine vm = (VirtualMachine)lvi.Tag; + Directory.Delete(vm.DefDir, true); + } + mainConf.DeleteVirtMach(lvi.Index/*lvi.Tag*/); VirtMachListView.Items.Remove(lvi); vmConfigs.Remove(lvi.Tag); Modified: trunk/tools/RosTE/GUI/VirtualMachine.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/VirtualMachine.cs?… ============================================================================== --- trunk/tools/RosTE/GUI/VirtualMachine.cs (original) +++ trunk/tools/RosTE/GUI/VirtualMachine.cs Tue Jun 26 02:48:23 2007 @@ -10,14 +10,13 @@ { private Data data; private DataRow dataRow; - private string machine; - private string cdrom; - private char boot; - private string snapshot; - private int memory; - private int processors; - private bool localTime; - private bool fullScreen; + + #region Virtual machine properties + + public int VirtMachID + { + get { return (int)dataRow["VirtMachID"]; } + } public string Name { @@ -25,73 +24,85 @@ set { dataRow["Name"] = value; } } + public string MachType + { + get { return (string)dataRow["MachType"]; } + set { dataRow["MachType"] = value; } + } + public string DefDir { get { return (string)dataRow["DefDir"]; } - } - - public string Machine - { - get { return machine; } - set { machine = value; } - } - - - public string Cdrom - { - get { return cdrom; } - set { cdrom = value; } - } - public string Boot - { - get - { - switch (boot) - { - case 'a': return "floppy"; - case 'c': return "harddisk"; - case 'd': return "cdrom"; - case 'n': return "network"; - default: throw new ArgumentException("Boot"); - } - } - set - { - switch (value) - { - case "floppy": boot = 'a'; break; - case "harddisk": boot = 'c'; break; - case "cdrom": boot = 'd'; break; - case "network": boot = 'n'; break; - default: throw new ArgumentException("Boot"); - } - } - } - public string SnapShot - { - get { return snapshot; } - set { snapshot = value; } - } - public int Memory - { - get { return memory; } - set { memory = value; } - } - public int Processors - { - get { return processors; } - set { processors = value; } - } - public bool LocalTime - { - get { return localTime; } - set { localTime = value; } - } - public bool FullScreen - { - get { return fullScreen; } - set { fullScreen = value; } - } + set { dataRow["DefDir"] = value; } + } + + public int MemSize + { + get { return (int)dataRow["MemSize"]; } + set { dataRow["MemSize"] = value; } + } + + public bool CdRomEnable + { + get { return (bool)dataRow["CdRomEnable"]; } + set { dataRow["CdRomEnable"] = value; } + } + + public bool CdRomUsePhys + { + get { return (bool)dataRow["CdRomUsePhys"]; } + set { dataRow["CdRomUsePhys"] = value; } + } + + public string CdRomPhysDrv + { + get { return (string)dataRow["CdRomPhysDrv"]; } + set { dataRow["CdRomPhysDrv"] = value; } + } + + public bool CdRomUseIso + { + get { return (bool)dataRow["CdRomUseIso"]; } + set { dataRow["CdRomUseIso"] = value; } + } + + public string CdRomIsoImg + { + get { return (string)dataRow["CdRomIsoImg"]; } + set { dataRow["CdRomIsoImg"] = value; } + } + + public bool FloppyEnable + { + get { return (bool)dataRow["FloppyEnable"]; } + set { dataRow["FloppyEnable"] = value; } + } + + public bool FloppyUsePhys + { + get { return (bool)dataRow["FloppyUsePhys"]; } + set { dataRow["FloppyUsePhys"] = value; } + } + + public string FloppyPhysDrv + { + get { return (string)dataRow["FloppyPhysDrv"]; } + set { dataRow["FloppyPhysDrv"] = value; } + } + + public bool FloppyUseIso + { + get { return (bool)dataRow["FloppyUseIso"]; } + set { dataRow["FloppyUseIso"] = value; } + } + + public string FloppyIsoImg + { + get { return (string)dataRow["FloppyIsoImg"]; } + set { dataRow["FloppyIsoImg"] = value; } + } + + #endregion public override string ToString() {

1 0

[gedmurphy] 27278: add basic code for saving and reloading individual image config files via the ADO database
by gedmurphy＠svn.reactos.org 25 Jun '07

25 Jun '07

Author: gedmurphy Date: Tue Jun 26 00:10:19 2007 New Revision: 27278 URL: http://svn.reactos.org/svn/reactos?rev=27278&view=rev Log: add basic code for saving and reloading individual image config files via the ADO database Modified: trunk/tools/RosTE/GUI/MainConfig.cs trunk/tools/RosTE/GUI/MainForm.cs trunk/tools/RosTE/GUI/VirtualMachine.cs Modified: trunk/tools/RosTE/GUI/MainConfig.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/MainConfig.cs?rev=… ============================================================================== --- trunk/tools/RosTE/GUI/MainConfig.cs (original) +++ trunk/tools/RosTE/GUI/MainConfig.cs Tue Jun 26 00:10:19 2007 @@ -27,20 +27,38 @@ // and remove the need for LoadExistingImages / AddVirtMach / DeleteVirtMach } - public int GetNumberOfVms() + public bool LoadMainConfig() { - DataTable dt = data.DataSet.Tables["MainConfig"]; - return dt.Rows.Count; + bool ret = false; + string fileName = "Config.xml"; + + if (File.Exists(fileName)) + { + FileStream fs = new FileStream(fileName, FileMode.Open, FileAccess.Read); + XmlTextReader xtr = new XmlTextReader(fs); + data.DataSet.ReadXml(xtr, System.Data.XmlReadMode.ReadSchema); + xtr.Close(); + ret = true; + } + + return ret; } - public VirtualMachine GetExistingImage(int index) + public void SaveMainConfig() + { + string fileName = "Config.xml"; + FileStream fs = new FileStream(fileName, FileMode.Create, FileAccess.Write); + XmlTextWriter xtw = new XmlTextWriter(fs, System.Text.Encoding.Unicode); + data.DataSet.WriteXml(xtw, System.Data.XmlWriteMode.WriteSchema); + xtw.Close(); + } + + public string GetExistingImage(int index) { DataTable dt = data.DataSet.Tables["MainConfig"]; DataRow dr = dt.Rows[index]; - VirtualMachine vm = new VirtualMachine(data); - vm.LoadVirtMach((string)dr["Path"]); - return vm; + return (string)dr["Path"]; } public int AddVirtMach(string Path) @@ -62,30 +80,10 @@ dt.Rows.RemoveAt(index); } - public void SaveMainConfig() + public int GetNumberOfVms() { - string fileName = "Config.xml"; - FileStream fs = new FileStream(fileName, FileMode.Create, FileAccess.Write); - XmlTextWriter xtw = new XmlTextWriter(fs, System.Text.Encoding.Unicode); - data.DataSet.WriteXml(xtw, System.Data.XmlWriteMode.WriteSchema); - xtw.Close(); - } - - public bool LoadMainConfig() - { - bool ret = false; - string fileName = "Config.xml"; - - if (File.Exists(fileName)) - { - FileStream fs = new FileStream(fileName, FileMode.Open, FileAccess.Read); - XmlTextReader xtr = new XmlTextReader(fs); - data.DataSet.ReadXml(xtr, System.Data.XmlReadMode.ReadSchema); - xtr.Close(); - ret = true; - } - - return ret; + DataTable dt = data.DataSet.Tables["MainConfig"]; + return dt.Rows.Count; } } } Modified: trunk/tools/RosTE/GUI/MainForm.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/MainForm.cs?rev=27… ============================================================================== --- trunk/tools/RosTE/GUI/MainForm.cs (original) +++ trunk/tools/RosTE/GUI/MainForm.cs Tue Jun 26 00:10:19 2007 @@ -47,9 +47,13 @@ int num = mainConf.GetNumberOfVms(); for (int i = 0; i < num; i++) { - VirtualMachine vm = mainConf.GetExistingImage(i); - ListViewItem lvi = VirtMachListView.Items.Add(vm.ToString(), 0); - lvi.Tag = vm; + string image = mainConf.GetExistingImage(i); + VirtualMachine vm = new VirtualMachine(vmData); + if (vm.LoadVMConfig(image)) + { + ListViewItem lvi = VirtMachListView.Items.Add(vm.ToString(), 0); + lvi.Tag = vm; + } } } } @@ -145,6 +149,12 @@ private void MainForm_FormClosing(object sender, FormClosingEventArgs e) { mainConf.SaveMainConfig(); + + for (int i = 0; i < vmConfigs.Count; i++) + { + VirtualMachine vm = (VirtualMachine)vmConfigs[i]; + vm.SaveVMConfig(); + } } } } Modified: trunk/tools/RosTE/GUI/VirtualMachine.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/VirtualMachine.cs?… ============================================================================== --- trunk/tools/RosTE/GUI/VirtualMachine.cs (original) +++ trunk/tools/RosTE/GUI/VirtualMachine.cs Tue Jun 26 00:10:19 2007 @@ -1,12 +1,8 @@ using System; using System.IO; -using System.Collections.Generic; using System.Collections.Specialized; -using System.ComponentModel; using System.Data; -using System.Drawing; -using System.Text; -using System.Windows.Forms; +using System.Xml; namespace RosTEGUI { @@ -15,8 +11,6 @@ private Data data; private DataRow dataRow; private string machine; - private StringCollection floppy; - private StringCollection hardDisk; private string cdrom; private char boot; private string snapshot; @@ -27,14 +21,13 @@ public string Name { - get - { - return (string)dataRow["Name"]; - } - set - { - dataRow["Name"] = value; - } + get { return (string)dataRow["Name"]; } + set { dataRow["Name"] = value; } + } + + public string DefDir + { + get { return (string)dataRow["DefDir"]; } } public string Machine @@ -42,16 +35,8 @@ get { return machine; } set { machine = value; } } - public StringCollection Floppy - { - get { return floppy; } - // no set, use Floppy.Add() - } - public StringCollection HardDisk - { - get { return hardDisk; } - // no set, use HardDisk.Add() - } + + public string Cdrom { get { return cdrom; } @@ -116,9 +101,6 @@ public VirtualMachine(Data dataIn) { data = dataIn; - - DataTable dt = data.DataSet.Tables["VMConfig"]; - dataRow = dt.NewRow(); } // default @@ -148,21 +130,62 @@ dir = di.FullName; } + DataTable dt = data.DataSet.Tables["VMConfig"]; + int i = dt.Rows.Count + 1; + dataRow = dt.NewRow(); + dataRow["VirtMachID"] = i; + dataRow["Name"] = name; + dataRow["MachType"] = "test"; + dataRow["DefDir"] = dir; + dataRow["MemSize"] = memSize; + dataRow["CdRomEnable"] = true; + dataRow["CdRomUsePhys"] = false; + dataRow["CdRomPhyDrv"] = "R:"; + dataRow["CdRomUseIso"] = true; + dataRow["CdRomIsoImg"] = "err"; + dataRow["FloppyEnable"] = true; + dataRow["FloppyUsePhys"] = true; + dataRow["FloppyPhyDrive"] = "A:"; + dataRow["FloppyUseImg"] = false; + dataRow["FloppyIsoImg"] = "err"; + + dt.Rows.Add(dataRow); + Name = name; - - MessageBox.Show(name + " " + dir + " " + diskSize + " " + existImg + " " + memSize); return ret; } - public bool LoadVirtMach(string path) + public bool LoadVMConfig(string path) { bool ret = false; + string fileName = path + "\\Config.xml"; + if (File.Exists(fileName)) + { + FileStream fs = new FileStream(fileName, FileMode.Open, FileAccess.Read); + XmlTextReader xtr = new XmlTextReader(fs); + data.DataSet.ReadXml(xtr, System.Data.XmlReadMode.ReadSchema); + xtr.Close(); + + DataTable dt = data.DataSet.Tables["VMConfig"]; + dataRow = dt.Rows[0]; + + ret = true; + } return ret; } + public void SaveVMConfig() + { + string fileName = DefDir + "\\Config.xml"; + Directory.CreateDirectory(DefDir); + FileStream fs = new FileStream(fileName, FileMode.Create, FileAccess.Write); + XmlTextWriter xtw = new XmlTextWriter(fs, System.Text.Encoding.Unicode); + data.DataSet.WriteXml(xtw, System.Data.XmlWriteMode.WriteSchema); + xtw.Close(); + } } }

1 0

[fireball] 27277: - Map the framebuffer to 0xEE000000 in the freeldr, since 0xFF000000+ virtual addresses are used by the kernel for different purposes. - Add solid color fill. - Add VGA palette lookup for colors passed to the bootvid.dll. - Add support for transparent background in letters (color 16).
by fireball＠svn.reactos.org 25 Jun '07

25 Jun '07

Author: fireball Date: Mon Jun 25 22:02:59 2007 New Revision: 27277 URL: http://svn.reactos.org/svn/reactos?rev=27277&view=rev Log: - Map the framebuffer to 0xEE000000 in the freeldr, since 0xFF000000+ virtual addresses are used by the kernel for different purposes. - Add solid color fill. - Add VGA palette lookup for colors passed to the bootvid.dll. - Add support for transparent background in letters (color 16). Modified: branches/olpc/boot/freeldr/freeldr/arch/i386/loader.c branches/olpc/drivers/base/bootvid/vid.c branches/olpc/drivers/base/bootvid/vid_fb.c Modified: branches/olpc/boot/freeldr/freeldr/arch/i386/loader.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/boot/freeldr/freeldr/arch/… ============================================================================== --- branches/olpc/boot/freeldr/freeldr/arch/i386/loader.c (original) +++ branches/olpc/boot/freeldr/freeldr/arch/i386/loader.c Mon Jun 25 22:02:59 2007 @@ -49,7 +49,7 @@ extern PAGE_DIRECTORY_X86 framebuffer_pagetable; #define FRAMEBUFFER_PHYS 0xFD000000 -#define FRAMEBUFFER_VIRT 0xFF000000 +#define FRAMEBUFFER_VIRT 0xEE000000 #define FRAMEBUFFER_SIZE 2 * 1024 * 1024 PVOID Modified: branches/olpc/drivers/base/bootvid/vid.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/drivers/base/bootvid/vid.c… ============================================================================== --- branches/olpc/drivers/base/bootvid/vid.c (original) +++ branches/olpc/drivers/base/bootvid/vid.c Mon Jun 25 22:02:59 2007 @@ -40,7 +40,7 @@ 900 - 1 }; -ULONG TextColor = 0xFFFF; +ULONG TextColor = 0xF; ULONG curr_x = 0, curr_y = 0; BOOLEAN NextLine = FALSE; Modified: branches/olpc/drivers/base/bootvid/vid_fb.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/drivers/base/bootvid/vid_f… ============================================================================== --- branches/olpc/drivers/base/bootvid/vid_fb.c (original) +++ branches/olpc/drivers/base/bootvid/vid_fb.c Mon Jun 25 22:02:59 2007 @@ -31,9 +31,27 @@ extern UCHAR BitmapFont8x16[256 * 16]; extern UCHAR BitmapFont10x18[256 * 18 * 2]; - -//static BOOLEAN VidpInitialized = FALSE; -static PUCHAR VidpMemory = (VOID *)0xFF000000; +USHORT VgaPalette[] = { + 0x0000, /* 0 black */ + 0xA800, /* 1 blue */ + 0x0540, /* 2 green */ + 0xAD40, /* 3 cyan */ + 0x0015, /* 4 red */ + 0xA815, /* 5 magenta */ + 0x02B5, /* 6 brown */ + 0xAD55, /* 7 light gray */ + 0x52AA, /* 8 dark gray */ + 0xFAAA, /* 9 bright blue */ + 0x57EA, /* 10 bright green */ + 0xFFEA, /* 11 bright cyan */ + 0x52BF, /* 12 bright red */ + 0xFABF, /* 13 bright magenta */ + 0x57FF, /* 14 bright yellow */ + 0xFFFF /* 15 bright white */ +}; + +static BOOLEAN VidpInitialized = FALSE; +static PUCHAR VidpMemory = (VOID *)0xEE000000; #define CHAR_WIDTH 10 #define CHAR_HEIGHT 18 @@ -60,10 +78,16 @@ unsigned Line; unsigned Col; UCHAR BytesPerChar = (CHAR_WIDTH < 8) ? 1 : 2; - - //HACK - Color = 0xFFFF; - BackTextColor = 0; + BOOLEAN Transparent = FALSE; + + /* Transform from VGA palette to RGB565 */ + if (Color < 16) + Color = VgaPalette[Color]; + + if (BackTextColor < 16) + BackTextColor = VgaPalette[BackTextColor]; + else + Transparent = TRUE; FontPtr = (PUSHORT)(BitmapFont10x18 + Character * CHAR_HEIGHT * BytesPerChar); @@ -74,7 +98,11 @@ Mask = (1 << (CHAR_WIDTH-1)); for (Col = 0; Col < CHAR_WIDTH; Col++) { - Pixel[Col] = (0 != (FontPtr[Line] & Mask) ? Color : BackTextColor); + if (!Transparent) + Pixel[Col] = (0 != (FontPtr[Line] & Mask) ? Color : BackTextColor); + else + Pixel[Col] = (0 != (FontPtr[Line] & Mask) ? Color : Pixel[Col]); // transparent background + Mask = Mask >> 1; } Pixel = (WORD *) ((char *) Pixel + Stride); @@ -150,7 +178,6 @@ VidFbInitialize( IN BOOLEAN SetMode) { -#if 0 PHYSICAL_ADDRESS PhysicalAddress; if (!VidpInitialized) @@ -160,12 +187,9 @@ if (VidpMemory == NULL) return FALSE; - memset(VidpMemory, 0x00, 0x200000); - //memset((VOID *)0xFF000000, 0x90, 1024*1024); - VidpInitialized = TRUE; } -#endif + DPRINT1("VidFbInitialize(SetMode %d)\n", SetMode); return TRUE; } @@ -218,6 +242,27 @@ IN ULONG Bottom, IN ULONG Color) { + ULONG Line, Col; + PUSHORT p; + + /* Sanity checks */ + if (Top > Bottom) + return; + if (Left > Right) + return; + + /* Translate color to the VGA palette */ + if (Color < 16) + Color = VgaPalette[Color]; + + for (Line = Top; Line <= Bottom; Line++) + { + p = (PUSHORT)(VidpMemory + (Line * DISPLAY_WIDTH * BytesPerPixel) + Left * BytesPerPixel); + for (Col = 0; Col < (Right-Left); Col++) + { + *p++ = Color; + } + } } static VOID NTAPI

1 0

[weiden] 27276: Fix the build system, accidently broke it with r27269
by weiden＠svn.reactos.org 25 Jun '07

25 Jun '07

Author: weiden Date: Mon Jun 25 21:56:54 2007 New Revision: 27276 URL: http://svn.reactos.org/svn/reactos?rev=27276&view=rev Log: Fix the build system, accidently broke it with r27269 Modified: trunk/reactos/ReactOS.rbuild trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild trunk/reactos/dll/win32/ole32/ole32.rbuild trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/include.cpp trunk/reactos/tools/rbuild/rbuild.h Modified: trunk/reactos/ReactOS.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS.rbuild?rev=27276&r… ============================================================================== --- trunk/reactos/ReactOS.rbuild (original) +++ trunk/reactos/ReactOS.rbuild Mon Jun 25 21:56:54 2007 @@ -62,7 +62,7 @@ <include>.</include> <include>include</include> <include>include/psdk</include> - <include base="__intermediate">include/psdk</include> + <include root="intermediate">include/psdk</include> <include>include/dxsdk</include> <include>include/crt</include> <include>include/ddk</include> Modified: trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/hhctr… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild Mon Jun 25 21:56:54 2007 @@ -2,6 +2,7 @@ <importlibrary definition="hhctrl.ocx.spec.def" /> <include base="hhctrl">.</include> <include base="ReactOS">include/reactos/wine</include> + <include base="ReactOS" root="intermediate">include/reactos/wine</include> <define name="__REACTOS__" /> <define name="__WINESRC__" /> <define name="__USE_W32API" /> Modified: trunk/reactos/dll/win32/ole32/ole32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole32.rbui… ============================================================================== --- trunk/reactos/dll/win32/ole32/ole32.rbuild (original) +++ trunk/reactos/dll/win32/ole32/ole32.rbuild Mon Jun 25 21:56:54 2007 @@ -2,6 +2,7 @@ <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="ole32.spec.def" /> <include base="ole32">.</include> + <include base="ole32" root="intermediate">.</include> <include base="ReactOS">include/reactos/wine</include> <define name="__REACTOS__" /> <define name="__WINESRC__" /> Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Mon Jun 25 21:56:54 2007 @@ -684,9 +684,9 @@ Include& include = *includes[i]; if ( parameters.length () > 0 ) parameters += " "; - if ( include.baseValue == "__intermediate" ) + if ( include.root == "intermediate" ) path_prefix = backend->intermediateDirectory->name + cSep; - else if (include.baseValue == "__output" ) + else if (include.root == "output" ) path_prefix = backend->outputDirectory->name + cSep; else path_prefix = ""; @@ -797,7 +797,7 @@ for ( i = 0; i < data.includes.size(); i++ ) { const Include& include = *data.includes[i]; - string includeDirectory; + string includeDirectory, path_prefix; if ( include.baseModule != NULL && ( include.baseModule->type == RpcServer || include.baseModule->type == RpcClient || @@ -806,9 +806,18 @@ backend->intermediateDirectory ); else includeDirectory = include.directory; + + if ( include.root == "intermediate" ) + path_prefix = backend->intermediateDirectory->name + cSep; + else if (include.root == "output" ) + path_prefix = backend->outputDirectory->name + cSep; + else + path_prefix = ""; + fprintf ( fMakefile, - " -I%s", + " -I%s%s", + path_prefix.c_str(), includeDirectory.c_str() ); } for ( i = 0; i < data.defines.size(); i++ ) Modified: trunk/reactos/tools/rbuild/include.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/include.cpp?r… ============================================================================== --- trunk/reactos/tools/rbuild/include.cpp (original) +++ trunk/reactos/tools/rbuild/include.cpp Mon Jun 25 21:56:54 2007 @@ -52,7 +52,6 @@ { this->directory = NormalizeFilename ( basePath + sSep + directory ); this->basePath = NormalizeFilename ( basePath ); - this->baseValue = basePath; } Include::~Include () @@ -67,18 +66,12 @@ if ( att ) { bool referenceResolved = false; - baseValue = att->value; if ( !module ) { - if ( att->value == "__intermediate" || att->value == "__output" ) - referenceResolved = true; - else - { - throw XMLInvalidBuildFileException ( - node->location, - "'base' attribute illegal from global <include>" ); - } + throw XMLInvalidBuildFileException ( + node->location, + "'base' attribute illegal from global <include>" ); } if ( !referenceResolved ) @@ -109,4 +102,18 @@ } else directory = NormalizeFilename ( node->value ); + + att = node->GetAttribute ( "root", false ); + if ( att ) + { + if ( att->value != "intermediate" && att->value != "output" ) + { + throw InvalidAttributeValueException ( + node->location, + "root", + att->value ); + } + + root = att->value; + } } Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.h (original) +++ trunk/reactos/tools/rbuild/rbuild.h Mon Jun 25 21:56:54 2007 @@ -366,7 +366,7 @@ const Module* baseModule; std::string directory; std::string basePath; - std::string baseValue; + std::string root; Include ( const Project& project, const XMLElement* includeNode );

1 0

[gedmurphy] 27275: object restructuring
by gedmurphy＠svn.reactos.org 25 Jun '07

25 Jun '07

Author: gedmurphy Date: Mon Jun 25 19:49:49 2007 New Revision: 27275 URL: http://svn.reactos.org/svn/reactos?rev=27275&view=rev Log: object restructuring Added: trunk/tools/RosTE/GUI/MainConfig.cs Modified: trunk/tools/RosTE/GUI/MainForm.cs trunk/tools/RosTE/GUI/RosTEGUI.csproj trunk/tools/RosTE/GUI/VMConfig.xsd trunk/tools/RosTE/GUI/VMConfig.xsx trunk/tools/RosTE/GUI/VMDataBase.cs trunk/tools/RosTE/GUI/VirtualMachine.cs Added: trunk/tools/RosTE/GUI/MainConfig.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/MainConfig.cs?rev=… ============================================================================== --- trunk/tools/RosTE/GUI/MainConfig.cs (added) +++ trunk/tools/RosTE/GUI/MainConfig.cs Mon Jun 25 19:49:49 2007 @@ -1,0 +1,91 @@ +using System.Data; +using System.IO; +using System.Xml; +using System.Windows.Forms; + +namespace RosTEGUI +{ + public class MainConfig + { + private Data data = null; + + private static void PrintRows(DataTable dt) + { + for (int i = 0; i < dt.Rows.Count; i++) + { + string str = "row: " + i + ", VMConfigID: " + dt.Rows[i]["VMConfigID"] + ", Path " + dt.Rows[i]["Path"]; + MessageBox.Show(str); + } + } + + public MainConfig(Data dataIn) + { + data = dataIn; + + // FIXME: unfortunatley, .NET doesn't support binding of + // listview controls, we'll need to implement this manually + // and remove the need for LoadExistingImages / AddVirtMach / DeleteVirtMach + } + + public int GetNumberOfVms() + { + DataTable dt = data.DataSet.Tables["MainConfig"]; + return dt.Rows.Count; + } + + public VirtualMachine GetExistingImage(int index) + { + DataTable dt = data.DataSet.Tables["MainConfig"]; + DataRow dr = dt.Rows[index]; + + VirtualMachine vm = new VirtualMachine(data); + vm.LoadVirtMach((string)dr["Path"]); + return vm; + } + + public int AddVirtMach(string Path) + { + int i; + DataRow dr; + DataTable dt = data.DataSet.Tables["MainConfig"]; + i = dt.Rows.Count + 1; + dr = dt.NewRow(); + dr["VMConfigID"] = i; + dr["Path"] = Path; + dt.Rows.Add(dr); + return i; + } + + public void DeleteVirtMach(int index) + { + DataTable dt = data.DataSet.Tables["MainConfig"]; + dt.Rows.RemoveAt(index); + } + + public void SaveMainConfig() + { + string fileName = "Config.xml"; + FileStream fs = new FileStream(fileName, FileMode.Create, FileAccess.Write); + XmlTextWriter xtw = new XmlTextWriter(fs, System.Text.Encoding.Unicode); + data.DataSet.WriteXml(xtw, System.Data.XmlWriteMode.WriteSchema); + xtw.Close(); + } + + public bool LoadMainConfig() + { + bool ret = false; + string fileName = "Config.xml"; + + if (File.Exists(fileName)) + { + FileStream fs = new FileStream(fileName, FileMode.Open, FileAccess.Read); + XmlTextReader xtr = new XmlTextReader(fs); + data.DataSet.ReadXml(xtr, System.Data.XmlReadMode.ReadSchema); + xtr.Close(); + ret = true; + } + + return ret; + } + } +} Modified: trunk/tools/RosTE/GUI/MainForm.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/MainForm.cs?rev=27… ============================================================================== --- trunk/tools/RosTE/GUI/MainForm.cs (original) +++ trunk/tools/RosTE/GUI/MainForm.cs Mon Jun 25 19:49:49 2007 @@ -13,7 +13,6 @@ { public partial class MainForm : Form { - //private ArrayList VirtualMachines; private MainConfig mainConf; private ArrayList vmConfigs; private Data mainData; @@ -44,7 +43,15 @@ mainConf = new MainConfig(mainData); if (mainConf.LoadMainConfig()) - mainConf.LoadExistingImages(VirtMachListView); + { + int num = mainConf.GetNumberOfVms(); + for (int i = 0; i < num; i++) + { + VirtualMachine vm = mainConf.GetExistingImage(i); + ListViewItem lvi = VirtMachListView.Items.Add(vm.ToString(), 0); + lvi.Tag = vm; + } + } } private void MainMenuHelpAbout_Click(object sender, EventArgs e) @@ -79,34 +86,41 @@ if (wizFrm.Option == 1) { int i = mainConf.AddVirtMach(wizFrm.DefDir); - VirtMachListView.Items.Add(i.ToString(), wizFrm.VMName, 0); - vmConfigs.Add(new VMConfig(vmData, - wizFrm.VMName, - wizFrm.DefDir, - wizFrm.DiskSizeGB, - wizFrm.ExistImg, - wizFrm.MemSizeMB)); + VirtualMachine VirtMach = new VirtualMachine(vmData); + VirtMach.CreateVMConfig(wizFrm.VMName, + wizFrm.DefDir, + wizFrm.DiskSizeGB, + wizFrm.ExistImg, + wizFrm.MemSizeMB); + vmConfigs.Add(VirtMach); + + ListViewItem lvi = VirtMachListView.Items.Add(VirtMach.ToString(), 0); + lvi.Tag = VirtMach; } else if (wizFrm.Option == 2) { DirectoryInfo di = Directory.GetParent(wizFrm.ExistImg); int i = mainConf.AddVirtMach(di.FullName); - VirtMachListView.Items.Add(i.ToString(), wizFrm.VMName, 0); + VirtualMachine VirtMach = new VirtualMachine(vmData); + VirtMach.CreateVMConfig(wizFrm.VMName, + wizFrm.ExistImg, + wizFrm.MemSizeMB); + vmConfigs.Add(VirtMach); - vmConfigs.Add(new VMConfig(vmData, - wizFrm.VMName, - wizFrm.ExistImg, - wizFrm.MemSizeMB)); + ListViewItem lvi = VirtMachListView.Items.Add(VirtMach.ToString(), 0); + lvi.Tag = VirtMach; } else { int i = mainConf.AddVirtMach("Images\\" + wizFrm.VMName); - VirtMachListView.Items.Add(i.ToString(), wizFrm.VMName, 0); + VirtualMachine VirtMach = new VirtualMachine(vmData); + VirtMach.CreateVMConfig(wizFrm.VMName); + vmConfigs.Add(VirtMach); - vmConfigs.Add(new VMConfig(vmData, - wizFrm.VMName)); + ListViewItem lvi = VirtMachListView.Items.Add(VirtMach.ToString(), 0); + lvi.Tag = VirtMach; } } } Modified: trunk/tools/RosTE/GUI/RosTEGUI.csproj URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/RosTEGUI.csproj?re… ============================================================================== --- trunk/tools/RosTE/GUI/RosTEGUI.csproj (original) +++ trunk/tools/RosTE/GUI/RosTEGUI.csproj Mon Jun 25 19:49:49 2007 @@ -126,6 +126,9 @@ <Compile Include="DeleteVM.Designer.cs"> <DependentUpon>DeleteVM.cs</DependentUpon> </Compile> + <Compile Include="MainConfig.cs"> + <DependentUpon>MainConfig.xsd</DependentUpon> + </Compile> <Compile Include="MainForm.cs"> <SubType>Form</SubType> </Compile> Modified: trunk/tools/RosTE/GUI/VMConfig.xsd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/VMConfig.xsd?rev=2… ============================================================================== --- trunk/tools/RosTE/GUI/VMConfig.xsd (original) +++ trunk/tools/RosTE/GUI/VMConfig.xsd Mon Jun 25 19:49:49 2007 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<xs:schema id="MainDB" targetNamespace="http://tempuri.org/MainDB.xsd" elementFormDefault="qualified" xmlns="http://tempuri.org/MainDB.xsd" xmlns:mstns="http://tempuri.org/MainDB.xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema"> +<xs:schema id="VMDB" targetNamespace="http://tempuri.org/MainDB.xsd" elementFormDefault="qualified" xmlns="http://tempuri.org/MainDB.xsd" xmlns:mstns="http://tempuri.org/MainDB.xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema"> <xs:element name="VMConfig"> <xs:complexType> <xs:sequence> @@ -29,14 +29,14 @@ <xs:complexType> <xs:sequence> <xs:element name="DiskID" type="xs:int" /> - <xs:element name="VMConfigID" type="xs:int" /> + <xs:element name="VirtMachID" type="xs:int" /> <xs:element name="Path" type="xs:string" /> <xs:element name="Size" type="xs:string" /> </xs:sequence> </xs:complexType> <xs:keyref name="VMConfigHardDisks" refer="VMConfigKey"> <xs:selector xpath="." /> - <xs:field xpath="mstns:VMConfigID" /> + <xs:field xpath="mstns:VirtMachID" /> </xs:keyref> <xs:key name="HardDisksKey"> <xs:selector xpath="." /> @@ -47,7 +47,7 @@ <xs:complexType> <xs:sequence> <xs:element name="CardID" type="xs:int" /> - <xs:element name="VMConfigID" type="xs:int" /> + <xs:element name="VirtMachID" type="xs:int" /> <xs:element name="Option" type="xs:string" /> <xs:element name="Vlan" type="xs:int" /> <xs:element name="MacAddr" type="xs:string" /> @@ -57,7 +57,7 @@ </xs:complexType> <xs:keyref name="VMConfigNetCards" refer="VMConfigKey"> <xs:selector xpath="." /> - <xs:field xpath="mstns:VMConfigID" /> + <xs:field xpath="mstns:VirtMachID" /> </xs:keyref> <xs:key name="NetCardsKey"> <xs:selector xpath="." /> Modified: trunk/tools/RosTE/GUI/VMConfig.xsx URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/VMConfig.xsx?rev=2… ============================================================================== --- trunk/tools/RosTE/GUI/VMConfig.xsx (original) +++ trunk/tools/RosTE/GUI/VMConfig.xsx Mon Jun 25 19:49:49 2007 @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?>  -<XSDDesignerLayout Style="LeftRight" layoutVersion="2" viewPortLeft="0" viewPortTop="-4677" zoom="100"> +<XSDDesignerLayout Style="LeftRight" layoutVersion="2" viewPortLeft="844" viewPortTop="-4677" zoom="100"> <VMConfig_XmlElement left="7091" top="-3148" width="7858" height="11721" selected="0" zOrder="0" index="0" expanded="1" /> - <HardDisks_XmlElement left="872" top="-3201" width="5292" height="2831" selected="0" zOrder="5" index="1" expanded="1" /> - <NetCards_XmlElement left="16033" top="-3176" width="5292" height="5371" selected="0" zOrder="2" index="2" expanded="1" /> - <VMConfigNetCards_XmlKeyref left="14808" top="-4433" width="503" height="503" selected="0" zOrder="10" expanded="0" /> - <VMConfigHardDisks_XmlKeyref left="6080" top="-4540" width="503" height="503" selected="0" zOrder="6" expanded="0" /> + <HardDisks_XmlElement left="872" top="-3201" width="5292" height="2831" selected="0" zOrder="2" index="1" expanded="1" /> + <NetCards_XmlElement left="16033" top="-3176" width="5292" height="5371" selected="0" zOrder="1" index="2" expanded="1" /> + <VMConfigNetCards_XmlKeyref left="14491" top="-4687" width="503" height="503" selected="0" zOrder="7" expanded="0" /> + <VMConfigHardDisks_XmlKeyref left="5763" top="-4794" width="503" height="503" selected="0" zOrder="3" expanded="0" /> </XSDDesignerLayout> Modified: trunk/tools/RosTE/GUI/VMDataBase.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/VMDataBase.cs?rev=… ============================================================================== --- trunk/tools/RosTE/GUI/VMDataBase.cs (original) +++ trunk/tools/RosTE/GUI/VMDataBase.cs Mon Jun 25 19:49:49 2007 @@ -54,132 +54,4 @@ return ret; } } - - public class MainConfig - { - private Data data = null; - - private int GetNumberOfVms() - { - DataTable dt = data.DataSet.Tables["MainConfig"]; - return dt.Rows.Count; - } - - private static void PrintRows(DataTable dt) - { - for (int i = 0; i < dt.Rows.Count; i++) - { - string str = "row: " + i + ", VMConfigID: " + dt.Rows[i]["VMConfigID"] + ", Path " + dt.Rows[i]["Path"]; - MessageBox.Show(str); - } - } - - public MainConfig(Data dataIn) - { - data = dataIn; - - // FIXME: unfortunatley, .NET doesn't support binding of - // listview controls, we'll need to implement this manually - // and remove the need for LoadExistingImages / AddVirtMach / DeleteVirtMach - } - - public void LoadExistingImages(ListView lv) - { - DataTable dt = data.DataSet.Tables["MainConfig"]; - - int num = GetNumberOfVms(); - for (int i = 0; i < num; i++) - { - DataRow dr = dt.Rows[i]; - - VirtualMachine vm = new VirtualMachine(data); - vm.LoadVirtMach((string)dr["Path"]); - - ListViewItem lvi = lv.Items.Add((string)dr["Path"], 0); - lvi.Tag = vm; - } - } - - public int AddVirtMach(string Path) - { - int i; - DataRow dr; - DataTable dt = data.DataSet.Tables["MainConfig"]; - i = dt.Rows.Count + 1; - dr = dt.NewRow(); - dr["VMConfigID"] = i; - dr["Path"] = Path; - dt.Rows.Add(dr); - return i; - } - - public void DeleteVirtMach(int index) - { - DataTable dt = data.DataSet.Tables["MainConfig"]; - dt.Rows.RemoveAt(index); - } - - public void SaveMainConfig() - { - string fileName = "Config.xml"; - FileStream fs = new FileStream(fileName, FileMode.Create, FileAccess.Write); - XmlTextWriter xtw = new XmlTextWriter(fs, System.Text.Encoding.Unicode); - data.DataSet.WriteXml(xtw, System.Data.XmlWriteMode.WriteSchema); - xtw.Close(); - } - - public bool LoadMainConfig() - { - bool ret = false; - string fileName = "Config.xml"; - - if (File.Exists(fileName)) - { - FileStream fs = new FileStream(fileName, FileMode.Open, FileAccess.Read); - XmlTextReader xtr = new XmlTextReader(fs); - data.DataSet.ReadXml(xtr, System.Data.XmlReadMode.ReadSchema); - xtr.Close(); - ret = true; - } - - return ret; - } - } - - - public class VMConfig - { - private Data data = null; - - // default - public VMConfig(Data dataIn, string name) : - this(dataIn, name, "Images\\" + name, 0.2f, null, 256) - { - } - - // existing - public VMConfig(Data dataIn, string name, string existImg, int memSize) : - this(dataIn, name, null, 0.0f, existImg, memSize) - { - } - - // new - public VMConfig(Data dataIn, - string name, - string dir, - float diskSize, - string existImg, - int memSize) - { - data = dataIn; - - if (existImg != null) - { - DirectoryInfo di = Directory.GetParent(existImg); - dir = di.FullName; - } - - MessageBox.Show(name + " " + dir + " " + diskSize + " " + existImg + " " + memSize); - } - } } Modified: trunk/tools/RosTE/GUI/VirtualMachine.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/VirtualMachine.cs?… ============================================================================== --- trunk/tools/RosTE/GUI/VirtualMachine.cs (original) +++ trunk/tools/RosTE/GUI/VirtualMachine.cs Mon Jun 25 19:49:49 2007 @@ -1,4 +1,5 @@ using System; +using System.IO; using System.Collections.Generic; using System.Collections.Specialized; using System.ComponentModel; @@ -11,6 +12,8 @@ { public class VirtualMachine { + private Data data; + private DataRow dataRow; private string machine; private StringCollection floppy; private StringCollection hardDisk; @@ -21,6 +24,18 @@ private int processors; private bool localTime; private bool fullScreen; + + public string Name + { + get + { + return (string)dataRow["Name"]; + } + set + { + dataRow["Name"] = value; + } + } public string Machine { @@ -93,14 +108,51 @@ set { fullScreen = value; } } + public override string ToString() + { + return Name; + } public VirtualMachine(Data dataIn) { - floppy = new StringCollection(); - hardDisk = new StringCollection(); + data = dataIn; - Floppy.Add("test"); - //MessageBox.Show(Floppy[0]); + DataTable dt = data.DataSet.Tables["VMConfig"]; + dataRow = dt.NewRow(); + } + + // default + public bool CreateVMConfig(string name) + { + return CreateVMConfig(name, "Images\\" + name, 0.2f, null, 256); + } + + // existing + public bool CreateVMConfig(string name, string existImg, int memSize) + { + return CreateVMConfig(name, null, 0.0f, existImg, memSize); + } + + // new + public bool CreateVMConfig(string name, + string dir, + float diskSize, + string existImg, + int memSize) + { + bool ret = false; + + if (existImg != null) + { + DirectoryInfo di = Directory.GetParent(existImg); + dir = di.FullName; + } + + Name = name; + + MessageBox.Show(name + " " + dir + " " + diskSize + " " + existImg + " " + memSize); + + return ret; } public bool LoadVirtMach(string path)

1 0

[fireball] 27274: - Ignore incorrect responses to ACK and just retry sending data until either ACK is read, or max number of iterations is reached. This fixes the keyboard/mouse detection problems when running ReactOS inside VMWare.
by fireball＠svn.reactos.org 25 Jun '07

25 Jun '07

Author: fireball Date: Mon Jun 25 15:55:51 2007 New Revision: 27274 URL: http://svn.reactos.org/svn/reactos?rev=27274&view=rev Log: - Ignore incorrect responses to ACK and just retry sending data until either ACK is read, or max number of iterations is reached. This fixes the keyboard/mouse detection problems when running ReactOS inside VMWare. Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.c Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/i80… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/i8042prt.c (original) +++ trunk/reactos/drivers/input/i8042prt/i8042prt.c Mon Jun 25 15:55:51 2007 @@ -164,11 +164,8 @@ } if (Ack == KBD_ACK) return STATUS_SUCCESS; - if (Ack != KBD_RESEND) - { - DPRINT1("Unexpected Ack 0x%x\n", Ack); - return STATUS_UNEXPECTED_IO_ERROR; - } + if (Ack == KBD_RESEND) + DPRINT("I8042 asks for a data resend\n"); } else { return STATUS_SUCCESS; }

1 0

[gedmurphy] 27273: - fix a few wizard bugs - forward all VMConfig ctors to the full overload
by gedmurphy＠svn.reactos.org 25 Jun '07

25 Jun '07

Author: gedmurphy Date: Mon Jun 25 14:36:42 2007 New Revision: 27273 URL: http://svn.reactos.org/svn/reactos?rev=27273&view=rev Log: - fix a few wizard bugs - forward all VMConfig ctors to the full overload Modified: trunk/tools/RosTE/GUI/NewVMWizard.Designer.cs trunk/tools/RosTE/GUI/NewVMWizard.cs trunk/tools/RosTE/GUI/NewVMWizard.resx trunk/tools/RosTE/GUI/VMDataBase.cs Modified: trunk/tools/RosTE/GUI/NewVMWizard.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/NewVMWizard.Design… ============================================================================== --- trunk/tools/RosTE/GUI/NewVMWizard.Designer.cs (original) +++ trunk/tools/RosTE/GUI/NewVMWizard.Designer.cs Mon Jun 25 14:36:42 2007 @@ -32,29 +32,6 @@ this.wizardFolderBrowser = new System.Windows.Forms.FolderBrowserDialog(); this.wizardOpenFile = new System.Windows.Forms.OpenFileDialog(); this.wizardNewVM = new Gui.Wizard.Wizard(); - this.memoryInfoPage = new Gui.Wizard.WizardPage(); - this.memoryLab7 = new System.Windows.Forms.Label(); - this.memoryLab1 = new System.Windows.Forms.Label(); - this.memoryHorizRuleLight = new System.Windows.Forms.Panel(); - this.memoryHorizRuleDark = new System.Windows.Forms.Panel(); - this.memoryLab6 = new System.Windows.Forms.Label(); - this.memoryPhyRam = new System.Windows.Forms.Label(); - this.memoryLab2 = new System.Windows.Forms.Label(); - this.memoryRecMax = new System.Windows.Forms.Label(); - this.memoryRec = new System.Windows.Forms.Label(); - this.memoryRecMin = new System.Windows.Forms.Label(); - this.memoryLab5 = new System.Windows.Forms.Label(); - this.memoryLab4 = new System.Windows.Forms.Label(); - this.memoryLab3 = new System.Windows.Forms.Label(); - this.memoryUpDwn = new System.Windows.Forms.NumericUpDown(); - this.memoryTrkBar = new System.Windows.Forms.TrackBar(); - this.memoryheader = new Gui.Wizard.Header(); - this.imageInfoPage = new Gui.Wizard.WizardPage(); - this.imageHeader = new Gui.Wizard.Header(); - this.imageLab2 = new System.Windows.Forms.Label(); - this.imageLab1 = new System.Windows.Forms.Label(); - this.imageFileBrowse = new System.Windows.Forms.Button(); - this.imageLocTxtBox = new System.Windows.Forms.TextBox(); this.harddiskInfoPage = new Gui.Wizard.WizardPage(); this.label5 = new System.Windows.Forms.Label(); this.harddiskDiskLab = new System.Windows.Forms.Label(); @@ -90,11 +67,30 @@ this.startInfoPage = new Gui.Wizard.InfoPage(); this.wizardFinishPage = new Gui.Wizard.WizardPage(); this.finishInfoPage = new Gui.Wizard.InfoPage(); + this.memoryInfoPage = new Gui.Wizard.WizardPage(); + this.memoryLab7 = new System.Windows.Forms.Label(); + this.memoryLab1 = new System.Windows.Forms.Label(); + this.memoryHorizRuleLight = new System.Windows.Forms.Panel(); + this.memoryHorizRuleDark = new System.Windows.Forms.Panel(); + this.memoryLab6 = new System.Windows.Forms.Label(); + this.memoryPhyRam = new System.Windows.Forms.Label(); + this.memoryLab2 = new System.Windows.Forms.Label(); + this.memoryRecMax = new System.Windows.Forms.Label(); + this.memoryRec = new System.Windows.Forms.Label(); + this.memoryRecMin = new System.Windows.Forms.Label(); + this.memoryLab5 = new System.Windows.Forms.Label(); + this.memoryLab4 = new System.Windows.Forms.Label(); + this.memoryLab3 = new System.Windows.Forms.Label(); + this.memoryUpDwn = new System.Windows.Forms.NumericUpDown(); + this.memoryTrkBar = new System.Windows.Forms.TrackBar(); + this.memoryheader = new Gui.Wizard.Header(); + this.imageInfoPage = new Gui.Wizard.WizardPage(); + this.imageHeader = new Gui.Wizard.Header(); + this.imageLab2 = new System.Windows.Forms.Label(); + this.imageLab1 = new System.Windows.Forms.Label(); + this.imageFileBrowse = new System.Windows.Forms.Button(); + this.imageLocTxtBox = new System.Windows.Forms.TextBox(); this.wizardNewVM.SuspendLayout(); - this.memoryInfoPage.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.memoryUpDwn)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.memoryTrkBar)).BeginInit(); - this.imageInfoPage.SuspendLayout(); this.harddiskInfoPage.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.harddiskUpDwn)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.harddiskTrkBar)).BeginInit(); @@ -103,6 +99,10 @@ this.optionInfoPage.SuspendLayout(); this.wizardStartPage.SuspendLayout(); this.wizardFinishPage.SuspendLayout(); + this.memoryInfoPage.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.memoryUpDwn)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.memoryTrkBar)).BeginInit(); + this.imageInfoPage.SuspendLayout(); this.SuspendLayout(); // // wizardOpenFile @@ -111,7 +111,6 @@ // // wizardNewVM // - this.wizardNewVM.Controls.Add(this.imageInfoPage); this.wizardNewVM.Controls.Add(this.harddiskInfoPage); this.wizardNewVM.Controls.Add(this.defaultDirInfoPage); this.wizardNewVM.Controls.Add(this.nameInfoPage); @@ -119,6 +118,7 @@ this.wizardNewVM.Controls.Add(this.wizardStartPage); this.wizardNewVM.Controls.Add(this.wizardFinishPage); this.wizardNewVM.Controls.Add(this.memoryInfoPage); + this.wizardNewVM.Controls.Add(this.imageInfoPage); this.wizardNewVM.Dock = System.Windows.Forms.DockStyle.Fill; this.wizardNewVM.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.wizardNewVM.Location = new System.Drawing.Point(0, 0); @@ -135,6 +135,387 @@ this.wizardNewVM.Size = new System.Drawing.Size(453, 320); this.wizardNewVM.TabIndex = 0; this.wizardNewVM.CloseFromCancel += new System.ComponentModel.CancelEventHandler(this.wizard1_CloseFromCancel); + // + // harddiskInfoPage + // + this.harddiskInfoPage.Controls.Add(this.label5); + this.harddiskInfoPage.Controls.Add(this.harddiskDiskLab); + this.harddiskInfoPage.Controls.Add(this.harddiskLab2); + this.harddiskInfoPage.Controls.Add(this.harddiskLab1); + this.harddiskInfoPage.Controls.Add(this.harddiskDiskSizeLab); + this.harddiskInfoPage.Controls.Add(this.harddiskLab3); + this.harddiskInfoPage.Controls.Add(this.harddiskRecMinLab); + this.harddiskInfoPage.Controls.Add(this.harddiskLab4); + this.harddiskInfoPage.Controls.Add(this.harddiskUpDwn); + this.harddiskInfoPage.Controls.Add(this.harddiskTrkBar); + this.harddiskInfoPage.Controls.Add(this.harddiskHeader); + this.harddiskInfoPage.Dock = System.Windows.Forms.DockStyle.Fill; + this.harddiskInfoPage.IsFinishPage = false; + this.harddiskInfoPage.Location = new System.Drawing.Point(0, 0); + this.harddiskInfoPage.Name = "harddiskInfoPage"; + this.harddiskInfoPage.Size = new System.Drawing.Size(453, 272); + this.harddiskInfoPage.TabIndex = 6; + this.harddiskInfoPage.Enter += new System.EventHandler(this.wizardHardDiskPage_Enter); + this.harddiskInfoPage.CloseFromNext += new Gui.Wizard.PageEventHandler(this.harddiskInfoPage_CloseFromNext); + this.harddiskInfoPage.CloseFromBack += new Gui.Wizard.PageEventHandler(this.harddiskInfoPage_CloseFromBack); + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(421, 142); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(21, 13); + this.label5.TabIndex = 37; + this.label5.Text = "MB"; + // + // harddiskDiskLab + // + this.harddiskDiskLab.AutoSize = true; + this.harddiskDiskLab.Location = new System.Drawing.Point(197, 190); + this.harddiskDiskLab.Name = "harddiskDiskLab"; + this.harddiskDiskLab.Size = new System.Drawing.Size(18, 13); + this.harddiskDiskLab.TabIndex = 36; + this.harddiskDiskLab.Text = "C:"; + // + // harddiskLab2 + // + this.harddiskLab2.AutoSize = true; + this.harddiskLab2.Location = new System.Drawing.Point(39, 190); + this.harddiskLab2.Name = "harddiskLab2"; + this.harddiskLab2.Size = new System.Drawing.Size(66, 13); + this.harddiskLab2.TabIndex = 35; + this.harddiskLab2.Text = "Physical disk"; + // + // harddiskLab1 + // + this.harddiskLab1.AutoSize = true; + this.harddiskLab1.Location = new System.Drawing.Point(9, 83); + this.harddiskLab1.Name = "harddiskLab1"; + this.harddiskLab1.Size = new System.Drawing.Size(352, 26); + this.harddiskLab1.TabIndex = 34; + this.harddiskLab1.Text = "Select a hard disk size for the virtual machine. The location of this image\r\ncorr" + + "esponds to the default directory previously chosen"; + // + // harddiskDiskSizeLab + // + this.harddiskDiskSizeLab.AutoSize = true; + this.harddiskDiskSizeLab.Location = new System.Drawing.Point(197, 215); + this.harddiskDiskSizeLab.Name = "harddiskDiskSizeLab"; + this.harddiskDiskSizeLab.Size = new System.Drawing.Size(25, 13); + this.harddiskDiskSizeLab.TabIndex = 33; + this.harddiskDiskSizeLab.Text = "size"; + // + // harddiskLab3 + // + this.harddiskLab3.AutoSize = true; + this.harddiskLab3.Location = new System.Drawing.Point(39, 215); + this.harddiskLab3.Name = "harddiskLab3"; + this.harddiskLab3.Size = new System.Drawing.Size(104, 13); + this.harddiskLab3.TabIndex = 32; + this.harddiskLab3.Text = "Available free space"; + // + // harddiskRecMinLab + // + this.harddiskRecMinLab.AutoSize = true; + this.harddiskRecMinLab.Location = new System.Drawing.Point(199, 238); + this.harddiskRecMinLab.Name = "harddiskRecMinLab"; + this.harddiskRecMinLab.Size = new System.Drawing.Size(23, 13); + this.harddiskRecMinLab.TabIndex = 29; + this.harddiskRecMinLab.Text = "min"; + // + // harddiskLab4 + // + this.harddiskLab4.AutoSize = true; + this.harddiskLab4.Location = new System.Drawing.Point(39, 238); + this.harddiskLab4.Name = "harddiskLab4"; + this.harddiskLab4.Size = new System.Drawing.Size(112, 13); + this.harddiskLab4.TabIndex = 26; + this.harddiskLab4.Text = "Recomended minimum"; + // + // harddiskUpDwn + // + this.harddiskUpDwn.Location = new System.Drawing.Point(355, 140); + this.harddiskUpDwn.Name = "harddiskUpDwn"; + this.harddiskUpDwn.Size = new System.Drawing.Size(60, 21); + this.harddiskUpDwn.TabIndex = 25; + this.harddiskUpDwn.ValueChanged += new System.EventHandler(this.harddiskUpdown_ValueChanged); + // + // harddiskTrkBar + // + this.harddiskTrkBar.Location = new System.Drawing.Point(12, 140); + this.harddiskTrkBar.Name = "harddiskTrkBar"; + this.harddiskTrkBar.Size = new System.Drawing.Size(337, 45); + this.harddiskTrkBar.SmallChange = 100; + this.harddiskTrkBar.TabIndex = 24; + this.harddiskTrkBar.Scroll += new System.EventHandler(this.harddiskTrkBar_Scroll); + // + // harddiskHeader + // + this.harddiskHeader.BackColor = System.Drawing.SystemColors.Control; + this.harddiskHeader.CausesValidation = false; + this.harddiskHeader.Description = "Choose the size of hard diskfor your virtual machine"; + this.harddiskHeader.Dock = System.Windows.Forms.DockStyle.Top; + this.harddiskHeader.Image = ((System.Drawing.Image)(resources.GetObject("harddiskHeader.Image"))); + this.harddiskHeader.Location = new System.Drawing.Point(0, 0); + this.harddiskHeader.Name = "harddiskHeader"; + this.harddiskHeader.Size = new System.Drawing.Size(453, 64); + this.harddiskHeader.TabIndex = 0; + this.harddiskHeader.Title = "Hard Disk Size"; + // + // defaultDirInfoPage + // + this.defaultDirInfoPage.Controls.Add(this.defaultDirLab2); + this.defaultDirInfoPage.Controls.Add(this.defaultDirLab1); + this.defaultDirInfoPage.Controls.Add(this.defaultDirBrowse); + this.defaultDirInfoPage.Controls.Add(this.defaultDirTxtBox); + this.defaultDirInfoPage.Controls.Add(this.defaultDirHeader); + this.defaultDirInfoPage.Dock = System.Windows.Forms.DockStyle.Fill; + this.defaultDirInfoPage.IsFinishPage = false; + this.defaultDirInfoPage.Location = new System.Drawing.Point(0, 0); + this.defaultDirInfoPage.Name = "defaultDirInfoPage"; + this.defaultDirInfoPage.Size = new System.Drawing.Size(453, 272); + this.defaultDirInfoPage.TabIndex = 7; + this.defaultDirInfoPage.CloseFromNext += new Gui.Wizard.PageEventHandler(this.wizardDefaultDirPage_CloseFromNext); + // + // defaultDirLab2 + // + this.defaultDirLab2.AutoSize = true; + this.defaultDirLab2.Location = new System.Drawing.Point(12, 137); + this.defaultDirLab2.Name = "defaultDirLab2"; + this.defaultDirLab2.Size = new System.Drawing.Size(89, 13); + this.defaultDirLab2.TabIndex = 4; + this.defaultDirLab2.Text = "Default Directory"; + // + // defaultDirLab1 + // + this.defaultDirLab1.AutoSize = true; + this.defaultDirLab1.Location = new System.Drawing.Point(9, 83); + this.defaultDirLab1.Name = "defaultDirLab1"; + this.defaultDirLab1.Size = new System.Drawing.Size(347, 39); + this.defaultDirLab1.TabIndex = 3; + this.defaultDirLab1.Text = "Type a location for your virtual machine. This is the location which your\r\nvirtua" + + "l machine image and it\'s corresponding configuration settings wil\r\n be stored."; + // + // defaultDirBrowse + // + this.defaultDirBrowse.Location = new System.Drawing.Point(366, 155); + this.defaultDirBrowse.Name = "defaultDirBrowse"; + this.defaultDirBrowse.Size = new System.Drawing.Size(75, 23); + this.defaultDirBrowse.TabIndex = 2; + this.defaultDirBrowse.Text = "Browse..."; + this.defaultDirBrowse.UseVisualStyleBackColor = true; + this.defaultDirBrowse.Click += new System.EventHandler(this.defaultDirBrowse_Click); + // + // defaultDirTxtBox + // + this.defaultDirTxtBox.Location = new System.Drawing.Point(12, 157); + this.defaultDirTxtBox.Name = "defaultDirTxtBox"; + this.defaultDirTxtBox.Size = new System.Drawing.Size(348, 21); + this.defaultDirTxtBox.TabIndex = 1; + // + // defaultDirHeader + // + this.defaultDirHeader.BackColor = System.Drawing.SystemColors.Control; + this.defaultDirHeader.CausesValidation = false; + this.defaultDirHeader.Description = "Choose the location of the directory which wil be used to hold your virtual machi" + + "ne and accociated settings"; + this.defaultDirHeader.Dock = System.Windows.Forms.DockStyle.Top; + this.defaultDirHeader.Image = ((System.Drawing.Image)(resources.GetObject("defaultDirHeader.Image"))); + this.defaultDirHeader.Location = new System.Drawing.Point(0, 0); + this.defaultDirHeader.Name = "defaultDirHeader"; + this.defaultDirHeader.Size = new System.Drawing.Size(453, 64); + this.defaultDirHeader.TabIndex = 0; + this.defaultDirHeader.Title = "Default Directory"; + // + // nameInfoPage + // + this.nameInfoPage.Controls.Add(this.nameLab1); + this.nameInfoPage.Controls.Add(this.nameHeader); + this.nameInfoPage.Controls.Add(this.nameLab2); + this.nameInfoPage.Controls.Add(this.nameTxtBox); + this.nameInfoPage.Dock = System.Windows.Forms.DockStyle.Fill; + this.nameInfoPage.IsFinishPage = false; + this.nameInfoPage.Location = new System.Drawing.Point(0, 0); + this.nameInfoPage.Name = "nameInfoPage"; + this.nameInfoPage.Size = new System.Drawing.Size(453, 272); + this.nameInfoPage.TabIndex = 3; + this.nameInfoPage.CloseFromNext += new Gui.Wizard.PageEventHandler(this.wizardNamePage_CloseFromNext); + // + // nameLab1 + // + this.nameLab1.AutoSize = true; + this.nameLab1.Location = new System.Drawing.Point(9, 83); + this.nameLab1.Name = "nameLab1"; + this.nameLab1.Size = new System.Drawing.Size(343, 39); + this.nameLab1.TabIndex = 4; + this.nameLab1.Text = "Type a location for you virtual machine. This is the location which your\r\nvirtual" + + " machine image and it\'s corresponding configuration settings wil\r\n be stored."; + // + // nameHeader + // + this.nameHeader.BackColor = System.Drawing.SystemColors.Control; + this.nameHeader.CausesValidation = false; + this.nameHeader.Description = "Choose a name for you virtual machine which will be used to identify it via the c" + + "onsole"; + this.nameHeader.Dock = System.Windows.Forms.DockStyle.Top; + this.nameHeader.Image = ((System.Drawing.Image)(resources.GetObject("nameHeader.Image"))); + this.nameHeader.Location = new System.Drawing.Point(0, 0); + this.nameHeader.Name = "nameHeader"; + this.nameHeader.Size = new System.Drawing.Size(453, 64); + this.nameHeader.TabIndex = 2; + this.nameHeader.Title = "Virtual Machine name"; + // + // nameLab2 + // + this.nameLab2.AutoSize = true; + this.nameLab2.Location = new System.Drawing.Point(12, 137); + this.nameLab2.Name = "nameLab2"; + this.nameLab2.Size = new System.Drawing.Size(188, 13); + this.nameLab2.TabIndex = 1; + this.nameLab2.Text = "Enter a name for your virtual machine"; + // + // nameTxtBox + // + this.nameTxtBox.Location = new System.Drawing.Point(12, 157); + this.nameTxtBox.Name = "nameTxtBox"; + this.nameTxtBox.Size = new System.Drawing.Size(429, 21); + this.nameTxtBox.TabIndex = 0; + // + // optionInfoPage + // + this.optionInfoPage.Controls.Add(this.optionLab3); + this.optionInfoPage.Controls.Add(this.optionLab2); + this.optionInfoPage.Controls.Add(this.optionLab1); + this.optionInfoPage.Controls.Add(this.optionRadDefault); + this.optionInfoPage.Controls.Add(this.optionRadExist); + this.optionInfoPage.Controls.Add(this.optionRadNew); + this.optionInfoPage.Controls.Add(this.optionHeader); + this.optionInfoPage.Dock = System.Windows.Forms.DockStyle.Fill; + this.optionInfoPage.IsFinishPage = false; + this.optionInfoPage.Location = new System.Drawing.Point(0, 0); + this.optionInfoPage.Name = "optionInfoPage"; + this.optionInfoPage.Size = new System.Drawing.Size(453, 272); + this.optionInfoPage.TabIndex = 2; + // + // optionLab3 + // + this.optionLab3.AutoSize = true; + this.optionLab3.Location = new System.Drawing.Point(64, 220); + this.optionLab3.Name = "optionLab3"; + this.optionLab3.Size = new System.Drawing.Size(277, 26); + this.optionLab3.TabIndex = 6; + this.optionLab3.Text = "This option will set up a virtual machine using the default\r\nrecommended settings" + + " for your hardware"; + // + // optionLab2 + // + this.optionLab2.AutoSize = true; + this.optionLab2.Location = new System.Drawing.Point(64, 165); + this.optionLab2.Name = "optionLab2"; + this.optionLab2.Size = new System.Drawing.Size(298, 13); + this.optionLab2.TabIndex = 5; + this.optionLab2.Text = "This option will add an existing virtual machine to the console"; + // + // optionLab1 + // + this.optionLab1.AutoSize = true; + this.optionLab1.Location = new System.Drawing.Point(64, 110); + this.optionLab1.Name = "optionLab1"; + this.optionLab1.Size = new System.Drawing.Size(297, 26); + this.optionLab1.TabIndex = 4; + this.optionLab1.Text = "This option will take you through the process of setting up a \r\nnew virtual machi" + + "ne"; + // + // optionRadDefault + // + this.optionRadDefault.AutoSize = true; + this.optionRadDefault.Location = new System.Drawing.Point(46, 200); + this.optionRadDefault.Name = "optionRadDefault"; + this.optionRadDefault.Size = new System.Drawing.Size(210, 17); + this.optionRadDefault.TabIndex = 3; + this.optionRadDefault.Text = "Use the default recommended settings"; + this.optionRadDefault.UseVisualStyleBackColor = true; + // + // optionRadExist + // + this.optionRadExist.AutoSize = true; + this.optionRadExist.Location = new System.Drawing.Point(46, 145); + this.optionRadExist.Name = "optionRadExist"; + this.optionRadExist.Size = new System.Drawing.Size(173, 17); + this.optionRadExist.TabIndex = 2; + this.optionRadExist.Text = "Use an existing virtual machine"; + this.optionRadExist.UseVisualStyleBackColor = true; + // + // optionRadNew + // + this.optionRadNew.AutoSize = true; + this.optionRadNew.Checked = true; + this.optionRadNew.Location = new System.Drawing.Point(46, 90); + this.optionRadNew.Name = "optionRadNew"; + this.optionRadNew.Size = new System.Drawing.Size(165, 17); + this.optionRadNew.TabIndex = 1; + this.optionRadNew.TabStop = true; + this.optionRadNew.Text = "Create a new virtual machine"; + this.optionRadNew.UseVisualStyleBackColor = true; + // + // optionHeader + // + this.optionHeader.BackColor = System.Drawing.SystemColors.Control; + this.optionHeader.CausesValidation = false; + this.optionHeader.Description = "Create a new virtual machine or hook up to an existing one"; + this.optionHeader.Dock = System.Windows.Forms.DockStyle.Top; + this.optionHeader.Image = ((System.Drawing.Image)(resources.GetObject("optionHeader.Image"))); + this.optionHeader.Location = new System.Drawing.Point(0, 0); + this.optionHeader.Name = "optionHeader"; + this.optionHeader.Size = new System.Drawing.Size(453, 64); + this.optionHeader.TabIndex = 0; + this.optionHeader.Title = "Choose a setup option"; + // + // wizardStartPage + // + this.wizardStartPage.Controls.Add(this.startInfoPage); + this.wizardStartPage.Dock = System.Windows.Forms.DockStyle.Fill; + this.wizardStartPage.IsFinishPage = false; + this.wizardStartPage.Location = new System.Drawing.Point(0, 0); + this.wizardStartPage.Name = "wizardStartPage"; + this.wizardStartPage.Size = new System.Drawing.Size(453, 272); + this.wizardStartPage.TabIndex = 1; + // + // startInfoPage + // + this.startInfoPage.BackColor = System.Drawing.Color.White; + this.startInfoPage.Dock = System.Windows.Forms.DockStyle.Fill; + this.startInfoPage.Image = ((System.Drawing.Image)(resources.GetObject("startInfoPage.Image"))); + this.startInfoPage.Location = new System.Drawing.Point(0, 0); + this.startInfoPage.Name = "startInfoPage"; + this.startInfoPage.PageText = "This wizard enables you to quickly set up a new virtual machine"; + this.startInfoPage.PageTitle = "Welcome to the New Virtual Machine wizard"; + this.startInfoPage.Size = new System.Drawing.Size(453, 272); + this.startInfoPage.TabIndex = 0; + // + // wizardFinishPage + // + this.wizardFinishPage.Controls.Add(this.finishInfoPage); + this.wizardFinishPage.Dock = System.Windows.Forms.DockStyle.Fill; + this.wizardFinishPage.IsFinishPage = false; + this.wizardFinishPage.Location = new System.Drawing.Point(0, 0); + this.wizardFinishPage.Name = "wizardFinishPage"; + this.wizardFinishPage.Size = new System.Drawing.Size(453, 272); + this.wizardFinishPage.TabIndex = 4; + this.wizardFinishPage.CloseFromBack += new Gui.Wizard.PageEventHandler(this.wizardFinishPage_CloseFromBack); + // + // finishInfoPage + // + this.finishInfoPage.BackColor = System.Drawing.Color.White; + this.finishInfoPage.Dock = System.Windows.Forms.DockStyle.Fill; + this.finishInfoPage.Image = ((System.Drawing.Image)(resources.GetObject("finishInfoPage.Image"))); + this.finishInfoPage.Location = new System.Drawing.Point(0, 0); + this.finishInfoPage.Name = "finishInfoPage"; + this.finishInfoPage.PageText = "You new virtual machine is now ready to use via the console. Use the settings dia" + + "log for any additional fine tuning"; + this.finishInfoPage.PageTitle = "Completed the New Virtual Machine wizard"; + this.finishInfoPage.Size = new System.Drawing.Size(453, 272); + this.finishInfoPage.TabIndex = 0; // // memoryInfoPage // @@ -374,387 +755,6 @@ this.imageLocTxtBox.Size = new System.Drawing.Size(348, 21); this.imageLocTxtBox.TabIndex = 5; // - // harddiskInfoPage - // - this.harddiskInfoPage.Controls.Add(this.label5); - this.harddiskInfoPage.Controls.Add(this.harddiskDiskLab); - this.harddiskInfoPage.Controls.Add(this.harddiskLab2); - this.harddiskInfoPage.Controls.Add(this.harddiskLab1); - this.harddiskInfoPage.Controls.Add(this.harddiskDiskSizeLab); - this.harddiskInfoPage.Controls.Add(this.harddiskLab3); - this.harddiskInfoPage.Controls.Add(this.harddiskRecMinLab); - this.harddiskInfoPage.Controls.Add(this.harddiskLab4); - this.harddiskInfoPage.Controls.Add(this.harddiskUpDwn); - this.harddiskInfoPage.Controls.Add(this.harddiskTrkBar); - this.harddiskInfoPage.Controls.Add(this.harddiskHeader); - this.harddiskInfoPage.Dock = System.Windows.Forms.DockStyle.Fill; - this.harddiskInfoPage.IsFinishPage = false; - this.harddiskInfoPage.Location = new System.Drawing.Point(0, 0); - this.harddiskInfoPage.Name = "harddiskInfoPage"; - this.harddiskInfoPage.Size = new System.Drawing.Size(453, 272); - this.harddiskInfoPage.TabIndex = 6; - this.harddiskInfoPage.Enter += new System.EventHandler(this.wizardHardDiskPage_Enter); - this.harddiskInfoPage.CloseFromNext += new Gui.Wizard.PageEventHandler(this.harddiskInfoPage_CloseFromNext); - this.harddiskInfoPage.CloseFromBack += new Gui.Wizard.PageEventHandler(this.harddiskInfoPage_CloseFromBack); - // - // label5 - // - this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(421, 142); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(20, 13); - this.label5.TabIndex = 37; - this.label5.Text = "GB"; - // - // harddiskDiskLab - // - this.harddiskDiskLab.AutoSize = true; - this.harddiskDiskLab.Location = new System.Drawing.Point(197, 190); - this.harddiskDiskLab.Name = "harddiskDiskLab"; - this.harddiskDiskLab.Size = new System.Drawing.Size(18, 13); - this.harddiskDiskLab.TabIndex = 36; - this.harddiskDiskLab.Text = "C:"; - // - // harddiskLab2 - // - this.harddiskLab2.AutoSize = true; - this.harddiskLab2.Location = new System.Drawing.Point(39, 190); - this.harddiskLab2.Name = "harddiskLab2"; - this.harddiskLab2.Size = new System.Drawing.Size(66, 13); - this.harddiskLab2.TabIndex = 35; - this.harddiskLab2.Text = "Physical disk"; - // - // harddiskLab1 - // - this.harddiskLab1.AutoSize = true; - this.harddiskLab1.Location = new System.Drawing.Point(9, 83); - this.harddiskLab1.Name = "harddiskLab1"; - this.harddiskLab1.Size = new System.Drawing.Size(352, 26); - this.harddiskLab1.TabIndex = 34; - this.harddiskLab1.Text = "Select a hard disk size for the virtual machine. The location of this image\r\ncorr" + - "esponds to the default directory previously chosen"; - // - // harddiskDiskSizeLab - // - this.harddiskDiskSizeLab.AutoSize = true; - this.harddiskDiskSizeLab.Location = new System.Drawing.Point(197, 215); - this.harddiskDiskSizeLab.Name = "harddiskDiskSizeLab"; - this.harddiskDiskSizeLab.Size = new System.Drawing.Size(25, 13); - this.harddiskDiskSizeLab.TabIndex = 33; - this.harddiskDiskSizeLab.Text = "size"; - // - // harddiskLab3 - // - this.harddiskLab3.AutoSize = true; - this.harddiskLab3.Location = new System.Drawing.Point(39, 215); - this.harddiskLab3.Name = "harddiskLab3"; - this.harddiskLab3.Size = new System.Drawing.Size(104, 13); - this.harddiskLab3.TabIndex = 32; - this.harddiskLab3.Text = "Available free space"; - // - // harddiskRecMinLab - // - this.harddiskRecMinLab.AutoSize = true; - this.harddiskRecMinLab.Location = new System.Drawing.Point(199, 238); - this.harddiskRecMinLab.Name = "harddiskRecMinLab"; - this.harddiskRecMinLab.Size = new System.Drawing.Size(23, 13); - this.harddiskRecMinLab.TabIndex = 29; - this.harddiskRecMinLab.Text = "min"; - // - // harddiskLab4 - // - this.harddiskLab4.AutoSize = true; - this.harddiskLab4.Location = new System.Drawing.Point(39, 238); - this.harddiskLab4.Name = "harddiskLab4"; - this.harddiskLab4.Size = new System.Drawing.Size(112, 13); - this.harddiskLab4.TabIndex = 26; - this.harddiskLab4.Text = "Recomended minimum"; - // - // harddiskUpDwn - // - this.harddiskUpDwn.Location = new System.Drawing.Point(355, 140); - this.harddiskUpDwn.Name = "harddiskUpDwn"; - this.harddiskUpDwn.Size = new System.Drawing.Size(60, 21); - this.harddiskUpDwn.TabIndex = 25; - this.harddiskUpDwn.ValueChanged += new System.EventHandler(this.harddiskUpdown_ValueChanged); - // - // harddiskTrkBar - // - this.harddiskTrkBar.Location = new System.Drawing.Point(12, 140); - this.harddiskTrkBar.Name = "harddiskTrkBar"; - this.harddiskTrkBar.Size = new System.Drawing.Size(337, 45); - this.harddiskTrkBar.TabIndex = 24; - this.harddiskTrkBar.Scroll += new System.EventHandler(this.harddiskTrkBar_Scroll); - // - // harddiskHeader - // - this.harddiskHeader.BackColor = System.Drawing.SystemColors.Control; - this.harddiskHeader.CausesValidation = false; - this.harddiskHeader.Description = "Choose the size of hard diskfor your virtual machine"; - this.harddiskHeader.Dock = System.Windows.Forms.DockStyle.Top; - this.harddiskHeader.Image = ((System.Drawing.Image)(resources.GetObject("harddiskHeader.Image"))); - this.harddiskHeader.Location = new System.Drawing.Point(0, 0); - this.harddiskHeader.Name = "harddiskHeader"; - this.harddiskHeader.Size = new System.Drawing.Size(453, 64); - this.harddiskHeader.TabIndex = 0; - this.harddiskHeader.Title = "Hard Disk Size"; - // - // defaultDirInfoPage - // - this.defaultDirInfoPage.Controls.Add(this.defaultDirLab2); - this.defaultDirInfoPage.Controls.Add(this.defaultDirLab1); - this.defaultDirInfoPage.Controls.Add(this.defaultDirBrowse); - this.defaultDirInfoPage.Controls.Add(this.defaultDirTxtBox); - this.defaultDirInfoPage.Controls.Add(this.defaultDirHeader); - this.defaultDirInfoPage.Dock = System.Windows.Forms.DockStyle.Fill; - this.defaultDirInfoPage.IsFinishPage = false; - this.defaultDirInfoPage.Location = new System.Drawing.Point(0, 0); - this.defaultDirInfoPage.Name = "defaultDirInfoPage"; - this.defaultDirInfoPage.Size = new System.Drawing.Size(453, 272); - this.defaultDirInfoPage.TabIndex = 7; - this.defaultDirInfoPage.CloseFromNext += new Gui.Wizard.PageEventHandler(this.wizardDefaultDirPage_CloseFromNext); - // - // defaultDirLab2 - // - this.defaultDirLab2.AutoSize = true; - this.defaultDirLab2.Location = new System.Drawing.Point(12, 137); - this.defaultDirLab2.Name = "defaultDirLab2"; - this.defaultDirLab2.Size = new System.Drawing.Size(89, 13); - this.defaultDirLab2.TabIndex = 4; - this.defaultDirLab2.Text = "Default Directory"; - // - // defaultDirLab1 - // - this.defaultDirLab1.AutoSize = true; - this.defaultDirLab1.Location = new System.Drawing.Point(9, 83); - this.defaultDirLab1.Name = "defaultDirLab1"; - this.defaultDirLab1.Size = new System.Drawing.Size(347, 39); - this.defaultDirLab1.TabIndex = 3; - this.defaultDirLab1.Text = "Type a location for your virtual machine. This is the location which your\r\nvirtua" + - "l machine image and it\'s corresponding configuration settings wil\r\n be stored."; - // - // defaultDirBrowse - // - this.defaultDirBrowse.Location = new System.Drawing.Point(366, 155); - this.defaultDirBrowse.Name = "defaultDirBrowse"; - this.defaultDirBrowse.Size = new System.Drawing.Size(75, 23); - this.defaultDirBrowse.TabIndex = 2; - this.defaultDirBrowse.Text = "Browse..."; - this.defaultDirBrowse.UseVisualStyleBackColor = true; - this.defaultDirBrowse.Click += new System.EventHandler(this.button1_Click); - // - // defaultDirTxtBox - // - this.defaultDirTxtBox.Location = new System.Drawing.Point(12, 157); - this.defaultDirTxtBox.Name = "defaultDirTxtBox"; - this.defaultDirTxtBox.Size = new System.Drawing.Size(348, 21); - this.defaultDirTxtBox.TabIndex = 1; - // - // defaultDirHeader - // - this.defaultDirHeader.BackColor = System.Drawing.SystemColors.Control; - this.defaultDirHeader.CausesValidation = false; - this.defaultDirHeader.Description = "Choose the location of the directory which wil be used to hold your virtual machi" + - "ne and accociated settings"; - this.defaultDirHeader.Dock = System.Windows.Forms.DockStyle.Top; - this.defaultDirHeader.Image = ((System.Drawing.Image)(resources.GetObject("defaultDirHeader.Image"))); - this.defaultDirHeader.Location = new System.Drawing.Point(0, 0); - this.defaultDirHeader.Name = "defaultDirHeader"; - this.defaultDirHeader.Size = new System.Drawing.Size(453, 64); - this.defaultDirHeader.TabIndex = 0; - this.defaultDirHeader.Title = "Default Directory"; - // - // nameInfoPage - // - this.nameInfoPage.Controls.Add(this.nameLab1); - this.nameInfoPage.Controls.Add(this.nameHeader); - this.nameInfoPage.Controls.Add(this.nameLab2); - this.nameInfoPage.Controls.Add(this.nameTxtBox); - this.nameInfoPage.Dock = System.Windows.Forms.DockStyle.Fill; - this.nameInfoPage.IsFinishPage = false; - this.nameInfoPage.Location = new System.Drawing.Point(0, 0); - this.nameInfoPage.Name = "nameInfoPage"; - this.nameInfoPage.Size = new System.Drawing.Size(453, 272); - this.nameInfoPage.TabIndex = 3; - this.nameInfoPage.CloseFromNext += new Gui.Wizard.PageEventHandler(this.wizardNamePage_CloseFromNext); - // - // nameLab1 - // - this.nameLab1.AutoSize = true; - this.nameLab1.Location = new System.Drawing.Point(9, 83); - this.nameLab1.Name = "nameLab1"; - this.nameLab1.Size = new System.Drawing.Size(343, 39); - this.nameLab1.TabIndex = 4; - this.nameLab1.Text = "Type a location for you virtual machine. This is the location which your\r\nvirtual" + - " machine image and it\'s corresponding configuration settings wil\r\n be stored."; - // - // nameHeader - // - this.nameHeader.BackColor = System.Drawing.SystemColors.Control; - this.nameHeader.CausesValidation = false; - this.nameHeader.Description = "Choose a name for you virtual machine which will be used to identify it via the c" + - "onsole"; - this.nameHeader.Dock = System.Windows.Forms.DockStyle.Top; - this.nameHeader.Image = ((System.Drawing.Image)(resources.GetObject("nameHeader.Image"))); - this.nameHeader.Location = new System.Drawing.Point(0, 0); - this.nameHeader.Name = "nameHeader"; - this.nameHeader.Size = new System.Drawing.Size(453, 64); - this.nameHeader.TabIndex = 2; - this.nameHeader.Title = "Virtual Machine name"; - // - // nameLab2 - // - this.nameLab2.AutoSize = true; - this.nameLab2.Location = new System.Drawing.Point(12, 137); - this.nameLab2.Name = "nameLab2"; - this.nameLab2.Size = new System.Drawing.Size(188, 13); - this.nameLab2.TabIndex = 1; - this.nameLab2.Text = "Enter a name for your virtual machine"; - // - // nameTxtBox - // - this.nameTxtBox.Location = new System.Drawing.Point(12, 157); - this.nameTxtBox.Name = "nameTxtBox"; - this.nameTxtBox.Size = new System.Drawing.Size(429, 21); - this.nameTxtBox.TabIndex = 0; - // - // optionInfoPage - // - this.optionInfoPage.Controls.Add(this.optionLab3); - this.optionInfoPage.Controls.Add(this.optionLab2); - this.optionInfoPage.Controls.Add(this.optionLab1); - this.optionInfoPage.Controls.Add(this.optionRadDefault); - this.optionInfoPage.Controls.Add(this.optionRadExist); - this.optionInfoPage.Controls.Add(this.optionRadNew); - this.optionInfoPage.Controls.Add(this.optionHeader); - this.optionInfoPage.Dock = System.Windows.Forms.DockStyle.Fill; - this.optionInfoPage.IsFinishPage = false; - this.optionInfoPage.Location = new System.Drawing.Point(0, 0); - this.optionInfoPage.Name = "optionInfoPage"; - this.optionInfoPage.Size = new System.Drawing.Size(453, 272); - this.optionInfoPage.TabIndex = 2; - this.optionInfoPage.CloseFromNext += new Gui.Wizard.PageEventHandler(this.wizardSetupOptionPage_CloseFromNext); - // - // optionLab3 - // - this.optionLab3.AutoSize = true; - this.optionLab3.Location = new System.Drawing.Point(64, 220); - this.optionLab3.Name = "optionLab3"; - this.optionLab3.Size = new System.Drawing.Size(277, 26); - this.optionLab3.TabIndex = 6; - this.optionLab3.Text = "This option will set up a virtual machine using the default\r\nrecommended settings" + - " for your hardware"; - // - // optionLab2 - // - this.optionLab2.AutoSize = true; - this.optionLab2.Location = new System.Drawing.Point(64, 165); - this.optionLab2.Name = "optionLab2"; - this.optionLab2.Size = new System.Drawing.Size(298, 13); - this.optionLab2.TabIndex = 5; - this.optionLab2.Text = "This option will add an existing virtual machine to the console"; - // - // optionLab1 - // - this.optionLab1.AutoSize = true; - this.optionLab1.Location = new System.Drawing.Point(64, 110); - this.optionLab1.Name = "optionLab1"; - this.optionLab1.Size = new System.Drawing.Size(297, 26); - this.optionLab1.TabIndex = 4; - this.optionLab1.Text = "This option will take you through the process of setting up a \r\nnew virtual machi" + - "ne"; - // - // optionRadDefault - // - this.optionRadDefault.AutoSize = true; - this.optionRadDefault.Location = new System.Drawing.Point(46, 200); - this.optionRadDefault.Name = "optionRadDefault"; - this.optionRadDefault.Size = new System.Drawing.Size(210, 17); - this.optionRadDefault.TabIndex = 3; - this.optionRadDefault.Text = "Use the default recommended settings"; - this.optionRadDefault.UseVisualStyleBackColor = true; - // - // optionRadExist - // - this.optionRadExist.AutoSize = true; - this.optionRadExist.Location = new System.Drawing.Point(46, 145); - this.optionRadExist.Name = "optionRadExist"; - this.optionRadExist.Size = new System.Drawing.Size(173, 17); - this.optionRadExist.TabIndex = 2; - this.optionRadExist.Text = "Use an existing virtual machine"; - this.optionRadExist.UseVisualStyleBackColor = true; - // - // optionRadNew - // - this.optionRadNew.AutoSize = true; - this.optionRadNew.Checked = true; - this.optionRadNew.Location = new System.Drawing.Point(46, 90); - this.optionRadNew.Name = "optionRadNew"; - this.optionRadNew.Size = new System.Drawing.Size(165, 17); - this.optionRadNew.TabIndex = 1; - this.optionRadNew.TabStop = true; - this.optionRadNew.Text = "Create a new virtual machine"; - this.optionRadNew.UseVisualStyleBackColor = true; - // - // optionHeader - // - this.optionHeader.BackColor = System.Drawing.SystemColors.Control; - this.optionHeader.CausesValidation = false; - this.optionHeader.Description = "Create a new virtual machine or hook up to an existing one"; - this.optionHeader.Dock = System.Windows.Forms.DockStyle.Top; - this.optionHeader.Image = ((System.Drawing.Image)(resources.GetObject("optionHeader.Image"))); - this.optionHeader.Location = new System.Drawing.Point(0, 0); - this.optionHeader.Name = "optionHeader"; - this.optionHeader.Size = new System.Drawing.Size(453, 64); - this.optionHeader.TabIndex = 0; - this.optionHeader.Title = "Choose a setup option"; - // - // wizardStartPage - // - this.wizardStartPage.Controls.Add(this.startInfoPage); - this.wizardStartPage.Dock = System.Windows.Forms.DockStyle.Fill; - this.wizardStartPage.IsFinishPage = false; - this.wizardStartPage.Location = new System.Drawing.Point(0, 0); - this.wizardStartPage.Name = "wizardStartPage"; - this.wizardStartPage.Size = new System.Drawing.Size(453, 272); - this.wizardStartPage.TabIndex = 1; - // - // startInfoPage - // - this.startInfoPage.BackColor = System.Drawing.Color.White; - this.startInfoPage.Dock = System.Windows.Forms.DockStyle.Fill; - this.startInfoPage.Image = ((System.Drawing.Image)(resources.GetObject("startInfoPage.Image"))); - this.startInfoPage.Location = new System.Drawing.Point(0, 0); - this.startInfoPage.Name = "startInfoPage"; - this.startInfoPage.PageText = "This wizard enables you to quickly set up a new virtual machine"; - this.startInfoPage.PageTitle = "Welcome to the New Virtual Machine wizard"; - this.startInfoPage.Size = new System.Drawing.Size(453, 272); - this.startInfoPage.TabIndex = 0; - // - // wizardFinishPage - // - this.wizardFinishPage.Controls.Add(this.finishInfoPage); - this.wizardFinishPage.Dock = System.Windows.Forms.DockStyle.Fill; - this.wizardFinishPage.IsFinishPage = false; - this.wizardFinishPage.Location = new System.Drawing.Point(0, 0); - this.wizardFinishPage.Name = "wizardFinishPage"; - this.wizardFinishPage.Size = new System.Drawing.Size(453, 272); - this.wizardFinishPage.TabIndex = 4; - this.wizardFinishPage.CloseFromBack += new Gui.Wizard.PageEventHandler(this.wizardFinishPage_CloseFromBack); - // - // finishInfoPage - // - this.finishInfoPage.BackColor = System.Drawing.Color.White; - this.finishInfoPage.Dock = System.Windows.Forms.DockStyle.Fill; - this.finishInfoPage.Image = ((System.Drawing.Image)(resources.GetObject("finishInfoPage.Image"))); - this.finishInfoPage.Location = new System.Drawing.Point(0, 0); - this.finishInfoPage.Name = "finishInfoPage"; - this.finishInfoPage.PageText = "You new virtual machine is now ready to use via the console. Use the settings dia" + - "log for any additional fine tuning"; - this.finishInfoPage.PageTitle = "Completed the New Virtual Machine wizard"; - this.finishInfoPage.Size = new System.Drawing.Size(453, 272); - this.finishInfoPage.TabIndex = 0; - // // NewVMWizard // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -765,12 +765,6 @@ this.Name = "NewVMWizard"; this.Text = "New Virtual Machine Wizard"; this.wizardNewVM.ResumeLayout(false); - this.memoryInfoPage.ResumeLayout(false); - this.memoryInfoPage.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.memoryUpDwn)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.memoryTrkBar)).EndInit(); - this.imageInfoPage.ResumeLayout(false); - this.imageInfoPage.PerformLayout(); this.harddiskInfoPage.ResumeLayout(false); this.harddiskInfoPage.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.harddiskUpDwn)).EndInit(); @@ -783,6 +777,12 @@ this.optionInfoPage.PerformLayout(); this.wizardStartPage.ResumeLayout(false); this.wizardFinishPage.ResumeLayout(false); + this.memoryInfoPage.ResumeLayout(false); + this.memoryInfoPage.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.memoryUpDwn)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.memoryTrkBar)).EndInit(); + this.imageInfoPage.ResumeLayout(false); + this.imageInfoPage.PerformLayout(); this.ResumeLayout(false); } Modified: trunk/tools/RosTE/GUI/NewVMWizard.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/NewVMWizard.cs?rev… ============================================================================== --- trunk/tools/RosTE/GUI/NewVMWizard.cs (original) +++ trunk/tools/RosTE/GUI/NewVMWizard.cs Mon Jun 25 14:36:42 2007 @@ -58,16 +58,7 @@ } } - private void wizardSetupOptionPage_CloseFromNext(object sender, Gui.Wizard.PageEventArgs e) - { - if (optionRadDefault.Checked == true) - e.Page = nameInfoPage; - else if (optionRadExist.Checked == true) - e.Page = imageInfoPage; - else - e.Page = nameInfoPage; - } - + //////////// Start wizard navi page handlers ////////////// private void wizardNamePage_CloseFromNext(object sender, Gui.Wizard.PageEventArgs e) { if (nameTxtBox.Text == "") @@ -78,6 +69,8 @@ if (optionRadDefault.Checked) e.Page = wizardFinishPage; + else if (optionRadExist.Checked) + e.Page = imageInfoPage; } private void wizardDefaultDirPage_CloseFromNext(object sender, Gui.Wizard.PageEventArgs e) @@ -94,69 +87,18 @@ } } - private void button1_Click(object sender, EventArgs e) - { - DialogResult result = wizardFolderBrowser.ShowDialog(); - - if (result == DialogResult.OK) - { - defaultDirTxtBox.Text = wizardFolderBrowser.SelectedPath; - } - } - - private void wizardHardDiskPage_Enter(object sender, EventArgs e) - { - DriveInfo di = new DriveInfo(defaultDirTxtBox.Text); - long AvailInGB = di.AvailableFreeSpace / (long)Math.Pow(1024, 3); - - harddiskTrkBar.Maximum = Convert.ToInt32(AvailInGB); - harddiskTrkBar.TickFrequency = harddiskTrkBar.Maximum / 20; - harddiskUpDwn.Maximum = harddiskTrkBar.Maximum; - - harddiskDiskLab.Text = di.Name; - harddiskDiskSizeLab.Text = Convert.ToString(AvailInGB) + " GB"; - harddiskRecMinLab.Text = "60 MB"; - } - - private void wizardMemoryPage_Enter(object sender, EventArgs e) - { - ulong totMem = Native.Memory.GetTotalMemory(); - if (totMem != 0) - { - totMem /= 1048576; //(1024^2) - memoryPhyRam.Text = Convert.ToString(totMem) + " MB"; - - memoryTrkBar.Maximum = Convert.ToInt32(totMem) * 2; - memoryTrkBar.TickFrequency = memoryTrkBar.Maximum / 20; - memoryUpDwn.Maximum = memoryTrkBar.Maximum; - - //memoryMinLab.Text = Convert.ToString(0) + " MB"; - //memoryMaxLab.Text = memoryTrkBar.Maximum.ToString() + " MB"; - - memoryRecMin.Text = Convert.ToString(totMem / 8) + " MB"; - memoryRec.Text = Convert.ToString(totMem / 4) + " MB"; - memoryRecMax.Text = Convert.ToString(totMem / 1.4) + " MB"; - } - } - - private void harddiskTrkBar_Scroll(object sender, EventArgs e) - { - harddiskUpDwn.Value = harddiskTrkBar.Value; - } - - private void harddiskUpdown_ValueChanged(object sender, EventArgs e) - { - harddiskTrkBar.Value = (int)harddiskUpDwn.Value; - } - - private void memoryTrkBar_Scroll(object sender, EventArgs e) - { - memoryUpDwn.Value = memoryTrkBar.Value; - } - - private void memoryUpDwn_ValueChanged(object sender, EventArgs e) - { - memoryTrkBar.Value = (int)memoryUpDwn.Value; + private void imageInfoPage_CloseFromNext(object sender, Gui.Wizard.PageEventArgs e) + { + if (imageLocTxtBox.Text == "") + { + MessageBox.Show("You must enter a valid image", "Error"); + e.Page = imageInfoPage; + } + else if (File.Exists(imageLocTxtBox.Text) == false) + { + MessageBox.Show("File does not exist", "Error"); + e.Page = imageInfoPage; + } } private void wizardFinishPage_CloseFromBack(object sender, Gui.Wizard.PageEventArgs e) @@ -170,7 +112,100 @@ private void imageInfoPage_CloseFromBack(object sender, Gui.Wizard.PageEventArgs e) { if (optionRadExist.Checked == true) - e.Page = optionInfoPage; + e.Page = nameInfoPage; + } + + private void harddiskInfoPage_CloseFromBack(object sender, Gui.Wizard.PageEventArgs e) + { + if (optionRadDefault.Checked == true) + e.Page = harddiskInfoPage; + } + + private void harddiskInfoPage_CloseFromNext(object sender, Gui.Wizard.PageEventArgs e) + { + if (optionRadNew.Checked == true) + e.Page = memoryInfoPage; + } + + private void memoryInfoPage_CloseFromBack(object sender, Gui.Wizard.PageEventArgs e) + { + if (optionRadNew.Checked == true) + e.Page = harddiskInfoPage; + } + //////////// End wizard navi page handlers ////////////// + + private void defaultDirBrowse_Click(object sender, EventArgs e) + { + DialogResult result = wizardFolderBrowser.ShowDialog(); + + if (result == DialogResult.OK) + { + defaultDirTxtBox.Text = wizardFolderBrowser.SelectedPath; + } + } + + private void wizardHardDiskPage_Enter(object sender, EventArgs e) + { + DriveInfo di = new DriveInfo(defaultDirTxtBox.Text); + long AvailInMB = di.AvailableFreeSpace / (long)Math.Pow(1024, 2); + + if (AvailInMB > 20480) AvailInMB = 20480; + + harddiskTrkBar.Minimum = 100; + harddiskTrkBar.Maximum = Convert.ToInt32(AvailInMB); + harddiskTrkBar.SmallChange = 100; + harddiskTrkBar.TickFrequency = 50; + harddiskUpDwn.Minimum = 100; + harddiskUpDwn.Maximum = harddiskTrkBar.Maximum; + harddiskUpDwn.Increment = 100; + + harddiskDiskLab.Text = di.Name; + harddiskDiskSizeLab.Text = Convert.ToString(AvailInMB) + " MB"; + harddiskRecMinLab.Text = "100 MB"; + } + + private void wizardMemoryPage_Enter(object sender, EventArgs e) + { + ulong totMem = Native.Memory.GetTotalMemory(); + if (totMem != 0) + { + totMem /= 1048576; //(1024^2) + memoryPhyRam.Text = Convert.ToString(totMem) + " MB"; + + memoryTrkBar.Minimum = 50; + memoryTrkBar.Maximum = Convert.ToInt32(totMem) * 2; + memoryTrkBar.TickFrequency = memoryTrkBar.Maximum / 20; + memoryUpDwn.Minimum = memoryTrkBar.Minimum; + memoryUpDwn.Maximum = memoryTrkBar.Maximum; + + //memoryMinLab.Text = Convert.ToString(0) + " MB"; + //memoryMaxLab.Text = memoryTrkBar.Maximum.ToString() + " MB"; + + memoryRecMin.Text = Convert.ToString(totMem / 8) + " MB"; + memoryRec.Text = Convert.ToString(totMem / 4) + " MB"; + memoryRecMax.Text = Convert.ToString(totMem / 1.4) + " MB"; + } + } + + private void harddiskTrkBar_Scroll(object sender, EventArgs e) + { + harddiskUpDwn.Value = harddiskTrkBar.Value; + + } + + private void harddiskUpdown_ValueChanged(object sender, EventArgs e) + { + harddiskTrkBar.Value = Convert.ToInt32(harddiskUpDwn.Value); + } + + private void memoryTrkBar_Scroll(object sender, EventArgs e) + { + memoryUpDwn.Value = memoryTrkBar.Value; + } + + private void memoryUpDwn_ValueChanged(object sender, EventArgs e) + { + memoryTrkBar.Value = (int)memoryUpDwn.Value; } private void imageFileBrowse_Click(object sender, EventArgs e) @@ -187,37 +222,5 @@ imageLocTxtBox.Text = wizardOpenFile.FileName; } } - - private void harddiskInfoPage_CloseFromBack(object sender, Gui.Wizard.PageEventArgs e) - { - if (optionRadDefault.Checked == true) - e.Page = harddiskInfoPage; - } - - private void harddiskInfoPage_CloseFromNext(object sender, Gui.Wizard.PageEventArgs e) - { - if (optionRadNew.Checked == true) - e.Page = memoryInfoPage; - } - - private void memoryInfoPage_CloseFromBack(object sender, Gui.Wizard.PageEventArgs e) - { - if (optionRadNew.Checked == true) - e.Page = harddiskInfoPage; - } - - private void imageInfoPage_CloseFromNext(object sender, Gui.Wizard.PageEventArgs e) - { - if (imageLocTxtBox.Text == "") - { - MessageBox.Show("You must enter a name", "Error"); - e.Page = imageInfoPage; - } - else if (File.Exists(imageLocTxtBox.Text) == false) - { - MessageBox.Show("File does not exist", "Error"); - e.Page = imageInfoPage; - } - } } } Modified: trunk/tools/RosTE/GUI/NewVMWizard.resx URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/NewVMWizard.resx?r… ============================================================================== --- trunk/tools/RosTE/GUI/NewVMWizard.resx (original) +++ trunk/tools/RosTE/GUI/NewVMWizard.resx Mon Jun 25 14:36:42 2007 @@ -124,18 +124,6 @@ <value>172, 17</value> </metadata> <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> - <data name="imageHeader.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> - <value> - R0lGODlhMQAxAPIAAMDAwICAgP///wAA/wAAAAAAAAAAAAAAACwAAAAAMQAxAAAD/zikvN7wyUinrfjq - zLfvESGOZGmeKAp+7KqkMBwAAgAEqds6Qm/TPVZsKAr0cCSj4KSLBAIQGvQSzBBHwJvoWHoiCYKvqOmQ - KnvLBno9E1iJ0pFSSzivfWESOQ4524F3aRZDcSh/IoBrejs0AB9+A3ZoUyEwgGKGXIF5Yy2NbBtKOJsA - FSmFiZhFkwSJPiMgUlGgDHY4rj2mJoW7oJI4RpKwG7LEm6xGkWu6WJyEx8BLrWjDFLI1LJJhCsl1aMxx - Qa0xgV80I9Sds1BVRxjlDTYMPrp3W3nnJeX6X6/qDzWyuJNlYwE8Cdu8JayUp8arOOHuqDIih8u/ebcU - Dtx2MJeKIwVANNyb8WSJwFESUThrtChCqgE/8EisQENNHmZbbBwZhUsVOkfopFWzUAPkzmmTMFCsVVRk - EovYkDo7ERXRVBZA/GTN0G2eIJxd0FwiBxSdKh1PQFK6ECyeGw9XiJwpe/Xijg5mcp3rEHdIsHt17ZLB - IMtIKSF9n6VTcbcxt7V8E0tmPNjxjsmYS1TebJmz586gGSQAADs= -</value> - </data> <data name="harddiskHeader.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> R0lGODlhMQAxAPIAAMDAwICAgP///wAA/wAAAAAAAAAAAAAAACwAAAAAMQAxAAAD/zikvN7wyUinrfjq @@ -308,4 +296,16 @@ IMtIKSF9n6VTcbcxt7V8E0tmPNjxjsmYS1TebJmz586gGSQAADs= </value> </data> + <data name="imageHeader.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value> + R0lGODlhMQAxAPIAAMDAwICAgP///wAA/wAAAAAAAAAAAAAAACwAAAAAMQAxAAAD/zikvN7wyUinrfjq + zLfvESGOZGmeKAp+7KqkMBwAAgAEqds6Qm/TPVZsKAr0cCSj4KSLBAIQGvQSzBBHwJvoWHoiCYKvqOmQ + KnvLBno9E1iJ0pFSSzivfWESOQ4524F3aRZDcSh/IoBrejs0AB9+A3ZoUyEwgGKGXIF5Yy2NbBtKOJsA + FSmFiZhFkwSJPiMgUlGgDHY4rj2mJoW7oJI4RpKwG7LEm6xGkWu6WJyEx8BLrWjDFLI1LJJhCsl1aMxx + Qa0xgV80I9Sds1BVRxjlDTYMPrp3W3nnJeX6X6/qDzWyuJNlYwE8Cdu8JayUp8arOOHuqDIih8u/ebcU + Dtx2MJeKIwVANNyb8WSJwFESUThrtChCqgE/8EisQENNHmZbbBwZhUsVOkfopFWzUAPkzmmTMFCsVVRk + EovYkDo7ERXRVBZA/GTN0G2eIJxd0FwiBxSdKh1PQFK6ECyeGw9XiJwpe/Xijg5mcp3rEHdIsHt17ZLB + IMtIKSF9n6VTcbcxt7V8E0tmPNjxjsmYS1TebJmz586gGSQAADs= +</value> + </data> </root> Modified: trunk/tools/RosTE/GUI/VMDataBase.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/VMDataBase.cs?rev=… ============================================================================== --- trunk/tools/RosTE/GUI/VMDataBase.cs (original) +++ trunk/tools/RosTE/GUI/VMDataBase.cs Mon Jun 25 14:36:42 2007 @@ -115,9 +115,7 @@ public void DeleteVirtMach(int index) { - DataRow dr; DataTable dt = data.DataSet.Tables["MainConfig"]; - //dt.Rows[index].Delete(); dt.Rows.RemoveAt(index); } @@ -154,32 +152,33 @@ private Data data = null; // default - public VMConfig(Data dataIn, - string name) + public VMConfig(Data dataIn, string name) : + this(dataIn, name, "Images\\" + name, 0.2f, null, 256) { - data = dataIn; - //DataRow dr = MainConfig.DataSet; } // existing - public VMConfig(Data dataIn, - string name, - string existImg, - int memSize) + public VMConfig(Data dataIn, string name, string existImg, int memSize) : + this(dataIn, name, null, 0.0f, existImg, memSize) { - data = dataIn; - MessageBox.Show(existImg + " " + memSize); } // new public VMConfig(Data dataIn, string name, string dir, - int diskSize, + float diskSize, string existImg, int memSize) { data = dataIn; + + if (existImg != null) + { + DirectoryInfo di = Directory.GetParent(existImg); + dir = di.FullName; + } + MessageBox.Show(name + " " + dir + " " + diskSize + " " + existImg + " " + memSize); } }

1 0

[fireball] 27272: - Change BSOD's size to 1200x900 to match OLPC. - Temporarily comment out CMPXCHG8B cpu feature support detection (Geode seems to be not recognized).
by fireball＠svn.reactos.org 24 Jun '07

24 Jun '07

Author: fireball Date: Mon Jun 25 00:43:35 2007 New Revision: 27272 URL: http://svn.reactos.org/svn/reactos?rev=27272&view=rev Log: - Change BSOD's size to 1200x900 to match OLPC. - Temporarily comment out CMPXCHG8B cpu feature support detection (Geode seems to be not recognized). Modified: branches/olpc/ntoskrnl/ke/bug.c branches/olpc/ntoskrnl/ke/i386/kiinit.c Modified: branches/olpc/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/ntoskrnl/ke/bug.c?rev=2727… ============================================================================== --- branches/olpc/ntoskrnl/ke/bug.c (original) +++ branches/olpc/ntoskrnl/ke/bug.c Mon Jun 25 00:43:35 2007 @@ -465,11 +465,11 @@ InbvResetDisplay(); /* Display blue screen */ - InbvSolidColorFill(0, 0, 639, 479, 4); + InbvSolidColorFill(0, 0, 1200-1, 900-1, 4); InbvSetTextColor(15); InbvInstallDisplayStringFilter(NULL); InbvEnableDisplayString(TRUE); - InbvSetScrollRegion(0, 0, 639, 479); + InbvSetScrollRegion(0, 0, 1200-1, 900-1); } /* Check if this is a hard error */ Modified: branches/olpc/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/ntoskrnl/ke/i386/kiinit.c?… ============================================================================== --- branches/olpc/ntoskrnl/ke/i386/kiinit.c (original) +++ branches/olpc/ntoskrnl/ke/i386/kiinit.c Mon Jun 25 00:43:35 2007 @@ -381,7 +381,7 @@ ULONG FeatureBits; LARGE_INTEGER PageDirectory; PVOID DpcStack; - ULONG Vendor[3]; + //ULONG Vendor[3]; /* Detect and set the CPU Type */ KiSetProcessorType(); @@ -463,6 +463,7 @@ KeI386XMMIPresent = (KeFeatureBits & KF_XMMI) ? TRUE : FALSE; /* Detect 8-byte compare exchange support */ +#if 0 //FIXME: Investigate why it's reported that Geode does not support this. if (!(KeFeatureBits & KF_CMPXCHG8B)) { /* Copy the vendor string */ @@ -475,6 +476,7 @@ Vendor[1], Vendor[2]); } +#endif /* Set the current MP Master KPRCB to the Boot PRCB */ Prcb->MultiThreadSetMaster = Prcb;

1 0

[greatlrd] 27271: Fixing allot of werid bugs + cleanup debug nsg that we do not need any longer.
by greatlrd＠svn.reactos.org 24 Jun '07

24 Jun '07

Author: greatlrd Date: Sun Jun 24 21:29:03 2007 New Revision: 27271 URL: http://svn.reactos.org/svn/reactos?rev=27271&view=rev Log: Fixing allot of werid bugs + cleanup debug nsg that we do not need any longer. Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c trunk/reactos/dll/directx/ddraw/Surface/surface_main.c trunk/reactos/dll/directx/ddraw/rosdraw.h trunk/reactos/dll/directx/ddraw/startup.c Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c Sun Jun 24 21:29:03 2007 @@ -26,7 +26,6 @@ _SEH_TRY { - DX_STUB_str("here\n"); if ((!IsBadReadPtr(pCallback,sizeof(LPDDENUMMODESCALLBACK2))) || @@ -39,16 +38,12 @@ else { - DX_STUB_str("here\n"); - DevMode.dmSize = sizeof(DEVMODE); DevMode.dmDriverExtra = 0; while (EnumDisplaySettingsEx(NULL, iMode, &DevMode, 0) == TRUE) { DDSURFACEDESC2 SurfaceDesc; - - DX_STUB_str("here\n"); iMode++; @@ -70,8 +65,6 @@ */ SurfaceDesc.ddpfPixelFormat.dwRGBBitCount = DevMode.dmBitsPerPel; - DX_STUB_str("here\n"); - // FIXME1: This->lpLcl->lpGbl->dwMonitorFrequency is not set ! if(dwFlags & DDEDM_REFRESHRATES && SurfaceDesc.dwRefreshRate != This->lpLcl->lpGbl->dwMonitorFrequency) { @@ -82,7 +75,6 @@ if(pDDSD) { - DX_STUB_str("here\n"); if(pDDSD->dwFlags & DDSD_HEIGHT && pDDSD->dwHeight != SurfaceDesc.dwHeight) continue; @@ -110,8 +102,6 @@ } _SEH_END; - DX_STUB_str("here\n"); - return ret; } @@ -120,8 +110,7 @@ DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) { HRESULT ret = DD_OK; - - DX_STUB_str("here\n"); + DX_WINDBG_trace(); _SEH_TRY { Modified: trunk/reactos/dll/directx/ddraw/Surface/surface_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/surface_main.c (original) +++ trunk/reactos/dll/directx/ddraw/Surface/surface_main.c Sun Jun 24 21:29:03 2007 @@ -196,7 +196,6 @@ /* FIXME add a check see if lock suport or not */ - DX_STUB_str("test\n"); if (prect!=NULL) { mdLock.bHasRect = TRUE; @@ -208,7 +207,7 @@ } //This->lpLcl->lpSurfMore->slist[0]->hDC = This->lpLcl->lpSurfMore->lpDD_lcl->hDC; - DX_STUB_str("test\n"); + mdLock.ddRVal = DDERR_NOTPALETTIZED; mdLock.Lock = This->lpLcl->lpSurfMore->lpDD_lcl->lpDDCB->HALDDSurface.Lock; mdLock.dwFlags = flags; @@ -216,14 +215,14 @@ mdLock.lpDD = This->lpLcl->lpSurfMore->lpDD_lcl->lpGbl; mdLock.lpSurfData = NULL; - DX_STUB_str("test\n"); + if (!DdResetVisrgn(This->lpLcl->lpSurfMore->slist[0], NULL)) { DX_STUB_str("Here DdResetVisrgn lock"); return DDERR_UNSUPPORTED; } - DX_STUB_str("test\n"); + if (mdLock.Lock(&mdLock)!= DDHAL_DRIVER_HANDLED) { DX_STUB_str("Here DDHAL_DRIVER_HANDLED lock"); @@ -231,7 +230,7 @@ } // FIXME ??? is this right ?? - DX_STUB_str("test\n"); + if (pDDSD != NULL) { ZeroMemory(pDDSD,sizeof(DDSURFACEDESC2)); @@ -251,21 +250,21 @@ // pDDSD->dwSize = sizeof(DDSURFACEDESC); //} - DX_STUB_str("test\n"); + pDDSD->lpSurface = (LPVOID) mdLock.lpSurfData; pDDSD->dwHeight =This->lpLcl->lpGbl->wHeight; pDDSD->dwWidth = This->lpLcl->lpGbl->wWidth; - DX_STUB_str("test\n"); + pDDSD->ddpfPixelFormat.dwRGBBitCount = This->lpLcl->lpGbl->lPitch/ 8; pDDSD->lPitch = This->lpLcl->lpGbl->lPitch; pDDSD->dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH; - DX_STUB_str("test\n"); - } - DX_STUB_str("test\n"); + + } + return mdLock.ddRVal; } Modified: trunk/reactos/dll/directx/ddraw/rosdraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/rosdraw.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/rosdraw.h (original) +++ trunk/reactos/dll/directx/ddraw/rosdraw.h Sun Jun 24 21:29:03 2007 @@ -234,7 +234,7 @@ return DD_OK; -/* +#if 0 #define DX_STUB_str(x) \ { \ char buffer[1024]; \ @@ -253,13 +253,22 @@ firstcallx = TRUE; \ } -*/ - - - + +#define DX_WINDBG_trace_res(width,height,bpp, freq) \ + static BOOL firstcallxx = TRUE; \ + if (firstcallxx) \ + { \ + char buffer[1024]; \ + sprintf ( buffer, "Setmode have been req width=%d, height=%d bpp=%d freq = %d\n",width,height,bpp, freq); \ + OutputDebugStringA(buffer); \ + firstcallxx = FALSE; \ + } +#else #define DX_WINDBG_trace() // + #define DX_WINDBG_trace_res(width,height,bpp, freq) \\ + #define DX_STUB_str(x) // - +#endif #endif /* __DDRAW_PRIVATE */ Modified: trunk/reactos/dll/directx/ddraw/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/startup.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/startup.c (original) +++ trunk/reactos/dll/directx/ddraw/startup.c Sun Jun 24 21:29:03 2007 @@ -174,9 +174,10 @@ DWORD hel_ret = DD_FALSE; DWORD devicetypes = 0; DWORD dwFlags = 0; - DEVMODE devmode; + DX_WINDBG_trace(); + /* * ddgbl.dwPDevice is not longer in use in windows 2000 and higher @@ -189,6 +190,9 @@ ddgbl.lpDriverHandle = &ddgbl; ddgbl.hDDVxd = -1; + + + if (reenable == FALSE) { @@ -207,6 +211,13 @@ } } } + + DxHeapMemAlloc(ddgbl.lpModeInfo, sizeof(DDHALMODEINFO)); + if (!ddgbl.lpModeInfo) + { + return DDERR_OUTOFMEMORY; + } + } /* Windows handler are by set of SetCooperLevel * so do not set it @@ -216,7 +227,6 @@ { if (lpGuid == NULL) { - DX_STUB_str("lpGuid == NULL\n"); devicetypes= 1; /* Create HDC for default, hal and hel driver */ @@ -298,8 +308,6 @@ hel_ret = StartDirectDrawHel(iface, reenable); } - DX_STUB_str("return\n"); - if (hal_ret!=DD_OK) { if (hel_ret!=DD_OK) @@ -335,32 +343,20 @@ ddgbl.rectDesktop.right = ddgbl.vmiData.dwDisplayWidth; ddgbl.rectDesktop.right = ddgbl.vmiData.dwDisplayHeight; - - /* HALINFO always returen false for lpModeInfo */ - DxHeapMemAlloc(ddgbl.lpModeInfo, sizeof(DDHALMODEINFO)); - if (!ddgbl.lpModeInfo) - { - return DDERR_OUTOFMEMORY; - } - - - EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &devmode); - ddgbl.lpModeInfo->dwWidth = devmode.dmPelsWidth; - ddgbl.lpModeInfo->dwHeight = devmode.dmPelsHeight; - ddgbl.lpModeInfo->dwBPP = devmode.dmBitsPerPel; + ddgbl.dwMonitorFrequency = GetDeviceCaps(GetWindowDC(NULL),VREFRESH); + ddgbl.lpModeInfo->dwWidth = ddgbl.vmiData.dwDisplayWidth; + ddgbl.lpModeInfo->dwHeight = ddgbl.vmiData.dwDisplayHeight; + ddgbl.lpModeInfo->dwBPP = ddgbl.vmiData.ddpfDisplay.dwRGBBitCount; ddgbl.lpModeInfo->lPitch = ddgbl.vmiData.lDisplayPitch; - ddgbl.lpModeInfo->wRefreshRate = (WORD)devmode.dmDisplayFrequency; + ddgbl.lpModeInfo->wRefreshRate = ddgbl.dwMonitorFrequency; ddgbl.lpModeInfo->dwRBitMask = ddgbl.vmiData.ddpfDisplay.dwRBitMask; ddgbl.lpModeInfo->dwGBitMask = ddgbl.vmiData.ddpfDisplay.dwGBitMask; ddgbl.lpModeInfo->dwBBitMask = ddgbl.vmiData.ddpfDisplay.dwBBitMask; ddgbl.lpModeInfo->dwAlphaBitMask = ddgbl.vmiData.ddpfDisplay.dwRGBAlphaBitMask; - ddgbl.dwMonitorFrequency = ddgbl.lpModeInfo->wRefreshRate; - ddgbl.dwNumModes = 1; - ddgbl.dwSaveNumModes = 1; - - DX_STUB_str("DD_OK\n"); + return DD_OK; } + HRESULT WINAPI StartDirectDrawHel(LPDIRECTDRAW iface, BOOL reenable) @@ -512,8 +508,6 @@ return DD_FALSE; } - DX_STUB_str("Trying alloc FourCCC \n"); - /* Alloc mpFourCC */ if (This->lpLcl->lpGbl->lpdwFourCC != NULL) { @@ -533,27 +527,19 @@ } } - DX_STUB_str("End Trying alloc FourCCC\n"); - - - - - /* Alloc mpTextures */ - +#if 0 DX_STUB_str("1 Here\n"); - /* if (This->lpLcl->lpGbl->texture != NULL) { - DxHeapMemFree(This->lpLcl->lpGbl->); - } - */ + DxHeapMemFree(This->lpLcl->lpGbl->texture; + } mpTextures = NULL; if (mD3dDriverData.dwNumTextureFormats > 0) { - DxHeapMemAlloc(mpTextures, sizeof(DDSURFACEDESC) * mD3dDriverData.dwNumTextureFormats); + mpTextures = (DDSURFACEDESC*) DxHeapMemAlloc(sizeof(DDSURFACEDESC) * mD3dDriverData.dwNumTextureFormats); if (mpTextures == NULL) { DxHeapMemFree(mpFourCC); @@ -564,7 +550,9 @@ DX_STUB_str("2 Here\n"); - +#else + mpTextures = NULL; +#endif /* Get all basic data from the driver */ @@ -600,8 +588,6 @@ // This->lpLcl->lpGbl->dwNumModes = mHALInfo.dwNumModes; // This->lpLcl->lpGbl->lpModeInfo = mHALInfo.lpModeInfo; - DX_STUB_str("Here\n"); - /* FIXME convert mpTextures to DDHALMODEINFO */ // DxHeapMemFree( mpTextures);

1 0

[greatlrd] 27270: fixing more value that are not beig fill in, now we getting back the freq
by greatlrd＠svn.reactos.org 24 Jun '07

24 Jun '07

Author: greatlrd Date: Sun Jun 24 17:20:44 2007 New Revision: 27270 URL: http://svn.reactos.org/svn/reactos?rev=27270&view=rev Log: fixing more value that are not beig fill in, now we getting back the freq Modified: trunk/reactos/dll/directx/ddraw/startup.c Modified: trunk/reactos/dll/directx/ddraw/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/startup.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/startup.c (original) +++ trunk/reactos/dll/directx/ddraw/startup.c Sun Jun 24 17:20:44 2007 @@ -174,6 +174,7 @@ DWORD hel_ret = DD_FALSE; DWORD devicetypes = 0; DWORD dwFlags = 0; + DEVMODE devmode; DX_WINDBG_trace(); @@ -333,6 +334,29 @@ ddgbl.rectDesktop.left= 0; ddgbl.rectDesktop.right = ddgbl.vmiData.dwDisplayWidth; ddgbl.rectDesktop.right = ddgbl.vmiData.dwDisplayHeight; + + + /* HALINFO always returen false for lpModeInfo */ + DxHeapMemAlloc(ddgbl.lpModeInfo, sizeof(DDHALMODEINFO)); + if (!ddgbl.lpModeInfo) + { + return DDERR_OUTOFMEMORY; + } + + + EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &devmode); + ddgbl.lpModeInfo->dwWidth = devmode.dmPelsWidth; + ddgbl.lpModeInfo->dwHeight = devmode.dmPelsHeight; + ddgbl.lpModeInfo->dwBPP = devmode.dmBitsPerPel; + ddgbl.lpModeInfo->lPitch = ddgbl.vmiData.lDisplayPitch; + ddgbl.lpModeInfo->wRefreshRate = (WORD)devmode.dmDisplayFrequency; + ddgbl.lpModeInfo->dwRBitMask = ddgbl.vmiData.ddpfDisplay.dwRBitMask; + ddgbl.lpModeInfo->dwGBitMask = ddgbl.vmiData.ddpfDisplay.dwGBitMask; + ddgbl.lpModeInfo->dwBBitMask = ddgbl.vmiData.ddpfDisplay.dwBBitMask; + ddgbl.lpModeInfo->dwAlphaBitMask = ddgbl.vmiData.ddpfDisplay.dwRGBAlphaBitMask; + ddgbl.dwMonitorFrequency = ddgbl.lpModeInfo->wRefreshRate; + ddgbl.dwNumModes = 1; + ddgbl.dwSaveNumModes = 1; DX_STUB_str("DD_OK\n"); return DD_OK; @@ -516,18 +540,20 @@ /* Alloc mpTextures */ -#if 0 + DX_STUB_str("1 Here\n"); + /* if (This->lpLcl->lpGbl->texture != NULL) { - DxHeapMemFree(This->lpLcl->lpGbl->texture; - } + DxHeapMemFree(This->lpLcl->lpGbl->); + } + */ mpTextures = NULL; if (mD3dDriverData.dwNumTextureFormats > 0) { - mpTextures = (DDSURFACEDESC*) DxHeapMemAlloc(sizeof(DDSURFACEDESC) * mD3dDriverData.dwNumTextureFormats); + DxHeapMemAlloc(mpTextures, sizeof(DDSURFACEDESC) * mD3dDriverData.dwNumTextureFormats); if (mpTextures == NULL) { DxHeapMemFree(mpFourCC); @@ -538,9 +564,7 @@ DX_STUB_str("2 Here\n"); -#else - mpTextures = NULL; -#endif + /* Get all basic data from the driver */ @@ -571,10 +595,10 @@ This->lpLcl->lpGbl->dwNumFourCC = mHALInfo.ddCaps.dwNumFourCCCodes; This->lpLcl->lpGbl->lpdwFourCC = mpFourCC; - This->lpLcl->lpGbl->dwMonitorFrequency = mHALInfo.dwMonitorFrequency; // 0 + // This->lpLcl->lpGbl->dwMonitorFrequency = mHALInfo.dwMonitorFrequency; // 0 This->lpLcl->lpGbl->dwModeIndex = mHALInfo.dwModeIndex; - This->lpLcl->lpGbl->dwNumModes = mHALInfo.dwNumModes; - This->lpLcl->lpGbl->lpModeInfo = mHALInfo.lpModeInfo; + // This->lpLcl->lpGbl->dwNumModes = mHALInfo.dwNumModes; + // This->lpLcl->lpGbl->lpModeInfo = mHALInfo.lpModeInfo; DX_STUB_str("Here\n");

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
42
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2007