Ros-diffs January 2008

ros-diffs@reactos.org

24 participants
539 discussions

[fireball] 31982: - Don't store memory allocation descriptors inside the bootloader, since this memory is unmapped in kernelmode. Fixes a pagefault after switching to paged mode.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Jan 25 14:14:44 2008 New Revision: 31982 URL: http://svn.reactos.org/svn/reactos?rev=31982&view=rev Log: - Don't store memory allocation descriptors inside the bootloader, since this memory is unmapped in kernelmode. Fixes a pagefault after switching to paged mode. Modified: branches/winldr/windows/wlmemory.c Modified: branches/winldr/windows/wlmemory.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/windows/wlmemory.c?rev=3… ============================================================================== --- branches/winldr/windows/wlmemory.c (original) +++ branches/winldr/windows/wlmemory.c Fri Jan 25 14:14:44 2008 @@ -107,7 +107,7 @@ ULONG PhysicalPageTables; ULONG KernelPageTables; -MEMORY_ALLOCATION_DESCRIPTOR Mad[1024]; +MEMORY_ALLOCATION_DESCRIPTOR *Mad; ULONG MadCount = 0; @@ -428,6 +428,9 @@ if (MempAllocatePageTables() == FALSE) return FALSE; + // Allocate memory for memory allocation descriptors + Mad = MmHeapAlloc(sizeof(MEMORY_ALLOCATION_DESCRIPTOR) * 1024); + // Setup an entry for each descriptor MemoryMap = MmGetMemoryMap(&NoEntries); if (MemoryMap == NULL)

16 years, 7 months

[cwittich] 31981: disable DbgPrint

by cwittich＠svn.reactos.org

Author: cwittich Date: Fri Jan 25 12:36:48 2008 New Revision: 31981 URL: http://svn.reactos.org/svn/reactos?rev=31981&view=rev Log: disable DbgPrint Modified: trunk/reactos/drivers/setup/blue/font.c Modified: trunk/reactos/drivers/setup/blue/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/setup/blue/font.c?… ============================================================================== --- trunk/reactos/drivers/setup/blue/font.c (original) +++ trunk/reactos/drivers/setup/blue/font.c Fri Jan 25 12:36:48 2008 @@ -183,7 +183,7 @@ Status = ZwReadFile(Handle, NULL, NULL, NULL, &IoStatusBlock, FileHeader, 4, &ByteOffset, NULL); ByteOffset.LowPart += 4; - DbgPrint("%s\n", FileHeader); + /* DbgPrint("%s\n", FileHeader); */ } } ZwClose(Handle);

16 years, 7 months

[gedmurphy] 31980: rewrite the config handler

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Fri Jan 25 00:33:58 2008 New Revision: 31980 URL: http://svn.reactos.org/svn/reactos?rev=31980&view=rev Log: rewrite the config handler Added: trunk/tools/RosTE/GUI/ConfigHandler.cs Modified: trunk/tools/RosTE/GUI/ConsoleSettings.Designer.cs trunk/tools/RosTE/GUI/ConsoleSettings.cs trunk/tools/RosTE/GUI/MainConfig.xsx trunk/tools/RosTE/GUI/MainForm.cs trunk/tools/RosTE/GUI/Properties/Resources.Designer.cs trunk/tools/RosTE/GUI/RosTEGUI.csproj trunk/tools/RosTE/GUI/SettingsForm.cs trunk/tools/RosTE/GUI/VMConfig.xsx trunk/tools/RosTE/GUI/VirtualMachine.cs trunk/tools/RosTE/GUI/qemu.cs Added: trunk/tools/RosTE/GUI/ConfigHandler.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/ConfigHandler.cs?r… ============================================================================== --- trunk/tools/RosTE/GUI/ConfigHandler.cs (added) +++ trunk/tools/RosTE/GUI/ConfigHandler.cs Fri Jan 25 00:33:58 2008 @@ -1,0 +1,384 @@ +using System; +using System.Data; +using System.IO; +using System.Xml; +using System.Windows.Forms; +using System.Collections.Generic; + +namespace RosTEGUI +{ + public struct VirtMach + { + public int id; + public string path; + + public VirtMach(int idIn, string pathIn) + { + id = idIn; + path = pathIn; + } + } + + public class MainConfig + { + private VMConfig vmConfig = null; + private DataSet dataSet = null; + + private string qemuPath; + private string vdkPath; + private string defVmPath; + private int updateSched; + private bool appDebug; + + List<VirtMach> virtMachs = null; + + #region properties + public string QemuPath + { + get { return qemuPath; } + set { qemuPath = value; } + } + + public string VdkPath + { + get { return vdkPath; } + set { vdkPath = value; } + } + + public string DefVmPath + { + get { return defVmPath; } + set { defVmPath = value; } + } + + public int UpdateSched + { + get { return updateSched; } + set { updateSched = value; } + } + + public bool AppDebug + { + get { return appDebug; } + set { appDebug = value; } + } + #endregion + + #region virtmach element + public string GetExistingImage(int index) + { + foreach (VirtMach vm in virtMachs) + { + if (vm.id == index) + return vm.path; + } + + return null; + } + + private bool LoadVirtMachs() + { + bool bRet = false; + + if (dataSet != null) + { + if (virtMachs == null) + { + virtMachs = new List<VirtMach>(); + } + + try + { + foreach (DataRow dr in dataSet.Tables["VirtMach"].Rows) + { + virtMachs.Add(new VirtMach((int)dr["VMConfigID"], (string)dr["Path"])); + } + + bRet = true; + } + catch (Exception ex) + { + Debug.LogMessage("Failed loading virtual machines", ex.Message, ex.StackTrace, true); + } + } + + return bRet; + } + + private void SaveVirtMachs() + { + if (dataSet != null && virtMachs != null) + { + try + { + DataTable virtMachTable = dataSet.Tables["VirtMach"]; + virtMachTable.Clear(); + + foreach (VirtMach vm in virtMachs) + { + DataRow dr = virtMachTable.NewRow(); + dr["VMConfigID"] = vm.id; + dr["Path"] = vm.path; + + virtMachTable.Rows.Add(dr); + } + } + catch (Exception ex) + { + Debug.LogMessage("Failed to save virtual machine table", ex.Message, ex.StackTrace, true); + } + } + } + + public int AddVirtMach(string pathIn) + { + if (dataSet != null && virtMachs != null) + { + int id = virtMachs.Count + 1; + virtMachs.Add(new VirtMach(id, pathIn)); + } + + return virtMachs.Count; + } + + public void DeleteVirtMach(int index) + { + bool bRet = false; + + foreach (VirtMach vm in virtMachs) + { + if (vm.id == index) + { + virtMachs.Remove(vm); + bRet = true; + } + } + } + + public int GetNumberOfVms() + { + return virtMachs.Count; + } + #endregion + + #region settings element + public void CreateSettings() + { + if (dataSet != null) + { + DataTable settingsTable; + DataRow settingsRow; + + try + { + settingsTable = dataSet.Tables["Settings"]; + + if (settingsTable.Rows.Count == 0) + { + settingsRow = settingsTable.NewRow(); + } + else + { + settingsRow = settingsTable.Rows[0]; + } + + // FIXME: these should be assigned by the installer + settingsRow["QemuPath"] = @"C:\Program Files\RosTE\QEmu"; + settingsRow["VdkPath"] = @"C:\Program Files\RosTE\VDK"; + settingsRow["DefVmPath"] = @"C:\Program Files\RosTE\Images"; + settingsRow["UpdateSched"] = 3; + settingsRow["AppDebug"] = false; + + settingsTable.Rows.Add(settingsRow); + } + catch (Exception ex) + { + Debug.LogMessage("failed to create new settings", ex.Message, ex.StackTrace, true); + } + } + } + + public bool LoadSettings() + { + bool bRet = false; + + if (dataSet != null) + { + try + { + DataRow settingsRow = dataSet.Tables["Settings"].Rows[0]; + + qemuPath = (string)settingsRow["QemuPath"]; + vdkPath = (string)settingsRow["VdkPath"]; + defVmPath = (string)settingsRow["DefVmPath"]; + updateSched = (int)settingsRow["UpdateSched"]; + appDebug = (bool)settingsRow["AppDebug"]; + + bRet = LoadVirtMachs(); + } + catch (Exception ex) + { + Debug.LogMessage("Failed to read settings from mainConf dataset", ex.Message); + } + } + + return bRet; + } + + public void SaveSettings() + { + if (dataSet != null) + { + try + { + DataRow settingsRow = dataSet.Tables["Settings"].Rows[0]; + settingsRow["QemuPath"] = qemuPath; + settingsRow["VdkPath"] = vdkPath; + settingsRow["DefVmPath"] = defVmPath; + settingsRow["UpdateSched"] = updateSched; + settingsRow["AppDebug"] = appDebug; + } + catch (Exception ex) + { + Debug.LogMessage("Failed to read settings from mainConf dataset", ex.Message); + } + } + } + #endregion + + public bool LoadMainConfig() + { + XmlTextReader xtr = null; + string fileName = "Config.xml"; + bool ret = false; + + if (LoadMainSchema()) + { + if (File.Exists(fileName)) + { + try + { + FileStream fs = new FileStream(fileName, FileMode.Open, FileAccess.Read); + xtr = new XmlTextReader(fs); + dataSet.ReadXml(xtr, System.Data.XmlReadMode.ReadSchema); + ret = true; + } + catch (Exception ex) + { + Debug.LogMessage("Failed to load main config file", ex.Message, ex.StackTrace, true); + } + finally + { + if (xtr != null) + xtr.Close(); + } + } + } + + return ret; + } + + public void SaveMainConfig() + { + XmlTextWriter xtw = null; + string fileName = "Config.xml"; + + if (dataSet == null) + { + if (!LoadMainSchema()) + return; + } + + SaveVirtMachs(); + + try + { + FileStream fs = new FileStream(fileName, FileMode.Create, FileAccess.Write); + xtw = new XmlTextWriter(fs, System.Text.Encoding.Unicode); + dataSet.WriteXml(xtw, System.Data.XmlWriteMode.WriteSchema); + } + catch (Exception ex) + { + Debug.LogMessage("Failed to save main config file", ex.Message, ex.StackTrace, true); + } + finally + { + if (xtw != null) + xtw.Close(); + } + } + + #region private methods + private bool LoadMainSchema() + { + string filename = "MainConfig.xsd"; + bool ret = false; + + dataSet = new DataSet(); + if (File.Exists(filename)) + { + try + { + FileStream fs = new FileStream(filename, FileMode.Open, FileAccess.Read); + XmlTextReader xtr = new XmlTextReader(fs); + dataSet.ReadXmlSchema(xtr); + xtr.Close(); + ret = true; + } + catch (Exception ex) + { + Debug.LogMessage("error loading main config schema", ex.Message, ex.StackTrace, true); + } + } + + return ret; + } + #endregion + } + + + + public class VMConfig + { + private DataSet data = null; + + public DataSet DataSet + { + get { return data; } + } + + /// <summary> + /// Load the schema for the virtual machine configuration file + /// </summary> + /// <returns>True on success, false on failure</returns> + public bool LoadVirtMachData() + { + XmlTextReader xtr = null; + string filename = "VMConfig.xsd"; + bool ret = false; + + data = new DataSet(); + if (File.Exists(filename)) + { + try + { + FileStream fs = new FileStream(filename, FileMode.Open, FileAccess.Read); + xtr = new XmlTextReader(fs); + data.ReadXmlSchema(xtr); + ret = true; + } + catch (Exception ex) + { + Debug.LogMessage("error loading VM config schema", ex.Message, ex.StackTrace, true); + } + finally + { + if (xtr != null) + xtr.Close(); + } + } + + return ret; + } + } +} Modified: trunk/tools/RosTE/GUI/ConsoleSettings.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/ConsoleSettings.De… ============================================================================== --- trunk/tools/RosTE/GUI/ConsoleSettings.Designer.cs (original) +++ trunk/tools/RosTE/GUI/ConsoleSettings.Designer.cs Fri Jan 25 00:33:58 2008 @@ -99,6 +99,7 @@ this.conUpdateNow.TabIndex = 1; this.conUpdateNow.Text = "Check now"; this.conUpdateNow.UseVisualStyleBackColor = true; + this.conUpdateNow.Click += new System.EventHandler(this.checkupdate_click); // // conUpdateCombo // @@ -145,7 +146,7 @@ this.button5.TabIndex = 1; this.button5.Text = "Browse..."; this.button5.UseVisualStyleBackColor = true; - this.button5.Click += new System.EventHandler(this.button5_Click); + this.button5.Click += new System.EventHandler(this.vmloc_click); // // conDefVmLoc // @@ -173,7 +174,7 @@ this.button4.TabIndex = 1; this.button4.Text = "Browse..."; this.button4.UseVisualStyleBackColor = true; - this.button4.Click += new System.EventHandler(this.button4_Click); + this.button4.Click += new System.EventHandler(this.vdkloc_click); // // conVdkLoc // @@ -201,7 +202,7 @@ this.button3.TabIndex = 1; this.button3.Text = "Browse..."; this.button3.UseVisualStyleBackColor = true; - this.button3.Click += new System.EventHandler(this.button3_Click); + this.button3.Click += new System.EventHandler(this.qemuloc_click); // // conQemuLoc // @@ -229,6 +230,7 @@ this.conAppDebug.TabIndex = 0; this.conAppDebug.Text = "Turn on application debugging"; this.conAppDebug.UseVisualStyleBackColor = true; + this.conAppDebug.CheckedChanged += new System.EventHandler(this.conAppDebug_CheckedChanged); // // conDialogOK // Modified: trunk/tools/RosTE/GUI/ConsoleSettings.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/ConsoleSettings.cs… ============================================================================== --- trunk/tools/RosTE/GUI/ConsoleSettings.cs (original) +++ trunk/tools/RosTE/GUI/ConsoleSettings.cs Fri Jan 25 00:33:58 2008 @@ -11,6 +11,7 @@ { public partial class ConsoleSettings : Form { + #region properties public string QemuPath { get { return conQemuLoc.Text; } @@ -35,6 +36,7 @@ { get { return conAppDebug.Checked; } } + #endregion public ConsoleSettings(MainConfig mainConf) { @@ -52,19 +54,19 @@ conAppDebug.Checked = mainConf.AppDebug; } - private void button3_Click(object sender, EventArgs e) + private void qemuloc_click(object sender, EventArgs e) { if (folderBrowserDialog.ShowDialog() == DialogResult.OK) conQemuLoc.Text = folderBrowserDialog.SelectedPath; } - private void button4_Click(object sender, EventArgs e) + private void vdkloc_click(object sender, EventArgs e) { if (folderBrowserDialog.ShowDialog() == DialogResult.OK) conVdkLoc.Text = folderBrowserDialog.SelectedPath; } - private void button5_Click(object sender, EventArgs e) + private void vmloc_click(object sender, EventArgs e) { if (folderBrowserDialog.ShowDialog() == DialogResult.OK) conDefVmLoc.Text = folderBrowserDialog.SelectedPath; @@ -93,5 +95,19 @@ this.DialogResult = DialogResult.OK; } + private void conAppDebug_CheckedChanged(object sender, EventArgs e) + { + CheckBox cb = (CheckBox)sender; + + if (cb.Checked) + Debug.TurnDebuggingOn(); + else + Debug.TurnDebuggingOff(); + } + + private void checkupdate_click(object sender, EventArgs e) + { + MessageBox.Show("Updates are not yet implemented"); + } } } Modified: trunk/tools/RosTE/GUI/MainConfig.xsx URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/MainConfig.xsx?rev… ============================================================================== --- trunk/tools/RosTE/GUI/MainConfig.xsx (original) +++ trunk/tools/RosTE/GUI/MainConfig.xsx Fri Jan 25 00:33:58 2008 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?>  <XSDDesignerLayout Style="LeftRight" layoutVersion="2" viewPortLeft="0" viewPortTop="-4677" zoom="100"> - <VirtMach_XmlElement left="8520" top="-3095" width="4842" height="1984" selected="0" zOrder="0" index="0" expanded="1" /> - <Settings_XmlElement left="2461" top="-3148" width="5291" height="3254" selected="0" zOrder="1" index="1" expanded="1" /> + <VirtMach_XmlElement left="8519" top="-3096" width="5371" height="2196" selected="0" zOrder="2" index="0" expanded="1" /> + <Settings_XmlElement left="2461" top="-3149" width="5291" height="3625" selected="0" zOrder="1" index="1" expanded="1" /> </XSDDesignerLayout> Modified: trunk/tools/RosTE/GUI/MainForm.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/MainForm.cs?rev=31… ============================================================================== --- trunk/tools/RosTE/GUI/MainForm.cs (original) +++ trunk/tools/RosTE/GUI/MainForm.cs Fri Jan 25 00:33:58 2008 @@ -14,7 +14,7 @@ public partial class MainForm : Form { private MainConfig mainConf; - private Data mainData; + private VMConfig mainData; public MainForm() { @@ -53,32 +53,24 @@ private void MainForm_Load(object sender, EventArgs e) { - mainData = new Data(); - if (!mainData.LoadMainData()) - MessageBox.Show("Failed to load Main Schema"); - - mainConf = new MainConfig(mainData); - - // load config and load any existing vm's + mainConf = new MainConfig(); if (mainConf.LoadMainConfig()) { mainConf.LoadSettings(); LoadVirtualMachines(mainConf); } - else // create settings for first run - { + else + { + // create settings for first run mainConf.CreateSettings(); } - - string str = mainConf.QemuPath; - } private void MainMenuHelpAbout_Click(object sender, EventArgs e) { AboutForm dlg = new AboutForm(); dlg.StartPosition = FormStartPosition.CenterScreen; - dlg.Show(); + dlg.ShowDialog(); } private void ImageListView_DoubleClick(object sender, EventArgs e) @@ -166,7 +158,7 @@ { Directory.Delete(vm.DefDir, true); } - catch (DirectoryNotFoundException ex) + catch (DirectoryNotFoundException) { MessageBox.Show(vm.DefDir + " has was not found!", "error", @@ -183,13 +175,14 @@ private void MainForm_FormClosing(object sender, FormClosingEventArgs e) { - mainConf.SaveMainConfig(); - foreach(ListViewItem lvi in VirtMachListView.Items) { VirtualMachine vm = (VirtualMachine)lvi.Tag; vm.SaveVMConfig(); } + + mainConf.SaveSettings(); + mainConf.SaveMainConfig(); } private void changeSettingsToolStripMenuItem_Click(object sender, EventArgs e) Modified: trunk/tools/RosTE/GUI/Properties/Resources.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/Properties/Resourc… ============================================================================== --- trunk/tools/RosTE/GUI/Properties/Resources.Designer.cs (original) +++ trunk/tools/RosTE/GUI/Properties/Resources.Designer.cs Fri Jan 25 00:33:58 2008 @@ -1,7 +1,7 @@ ï»¿//------------------------------------------------------------------------------ // <auto-generated> // This code was generated by a tool. -// Runtime Version:2.0.50727.42 +// Runtime Version:2.0.50727.312 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. 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 Fri Jan 25 00:33:58 2008 @@ -120,6 +120,7 @@ <Compile Include="AboutForm.Designer.cs"> <DependentUpon>AboutForm.cs</DependentUpon> </Compile> + <Compile Include="ConfigHandler.cs" /> <Compile Include="ConsoleSettings.cs"> <SubType>Form</SubType> </Compile> @@ -132,14 +133,11 @@ <Compile Include="DeleteVM.Designer.cs"> <DependentUpon>DeleteVM.cs</DependentUpon> </Compile> - <Compile Include="ErrorForm.cs"> - <SubType>Form</SubType> - </Compile> - <Compile Include="ErrorForm.Designer.cs"> - <DependentUpon>ErrorForm.cs</DependentUpon> - </Compile> - <Compile Include="MainConfig.cs"> - <DependentUpon>MainConfig.xsd</DependentUpon> + <Compile Include="DebugForm.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DebugForm.Designer.cs"> + <DependentUpon>DebugForm.cs</DependentUpon> </Compile> <Compile Include="MainForm.cs"> <SubType>Form</SubType> @@ -185,7 +183,6 @@ </Compile> <Compile Include="VirtualMachine.cs"> </Compile> - <Compile Include="VMDataBase.cs" /> <Compile Include="Wizard\Header.cs"> <SubType>UserControl</SubType> </Compile> @@ -238,9 +235,9 @@ <SubType>Designer</SubType> <DependentUpon>DeleteVM.cs</DependentUpon> </EmbeddedResource> - <EmbeddedResource Include="ErrorForm.resx"> - <SubType>Designer</SubType> - <DependentUpon>ErrorForm.cs</DependentUpon> + <EmbeddedResource Include="DebugForm.resx"> + <SubType>Designer</SubType> + <DependentUpon>DebugForm.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="NewHardDiskForm.resx"> <SubType>Designer</SubType> Modified: trunk/tools/RosTE/GUI/SettingsForm.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/SettingsForm.cs?re… ============================================================================== --- trunk/tools/RosTE/GUI/SettingsForm.cs (original) +++ trunk/tools/RosTE/GUI/SettingsForm.cs Fri Jan 25 00:33:58 2008 @@ -110,8 +110,8 @@ floppyEnableChkBox.Checked = VirtMach.FloppyEnable; int id = floppyPhyDrvCombo.FindString(VirtMach.FloppyPhysDrv); - if (id == -1) id = 0; - floppyPhyDrvCombo.SelectedIndex = id; + if (id != -1) + floppyPhyDrvCombo.SelectedIndex = id; if (VirtMach.CdRomUsePhys) { @@ -237,7 +237,7 @@ { TrackBar tb = (TrackBar)sender; memoryUpDwn.Value = tb.Value; - + /* char[] chars = { ' ', 'M', 'B' }; string max = memoryRecMax.Text.TrimEnd(chars); string min = memoryRecMin.Text.TrimEnd(chars); @@ -255,7 +255,7 @@ { memoryRecMin.ForeColor = SystemColors.WindowText; memoryRecMax.ForeColor = SystemColors.WindowText; - } + }*/ } private void memoryUpDwn_ValueChanged(object sender, EventArgs e) Modified: trunk/tools/RosTE/GUI/VMConfig.xsx URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/VMConfig.xsx?rev=3… ============================================================================== --- trunk/tools/RosTE/GUI/VMConfig.xsx (original) +++ trunk/tools/RosTE/GUI/VMConfig.xsx Fri Jan 25 00:33:58 2008 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?>  <XSDDesignerLayout Style="LeftRight" layoutVersion="2" viewPortLeft="-842" viewPortTop="-6097" zoom="100"> - <VMConfig_XmlElement left="5159" top="-3175" width="7859" height="7911" selected="0" zOrder="1" index="0" expanded="1" /> - <HardDisks_XmlElement left="-450" top="-3228" width="5292" height="3678" selected="0" zOrder="2" index="1" expanded="1" /> - <NetCards_XmlElement left="13547" top="-3175" width="5292" height="4101" selected="0" zOrder="3" index="2" expanded="1" /> + <VMConfig_XmlElement left="5159" top="-3175" width="7858" height="8864" selected="0" zOrder="1" index="0" expanded="1" /> + <HardDisks_XmlElement left="-450" top="-3228" width="5292" height="4101" selected="0" zOrder="2" index="1" expanded="1" /> + <NetCards_XmlElement left="13546" top="-3175" width="5292" height="4577" selected="0" zOrder="4" index="2" expanded="1" /> </XSDDesignerLayout> 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 Fri Jan 25 00:33:58 2008 @@ -10,7 +10,7 @@ { public class VMHardDrive { - private Data data; + private VMConfig vmConfig; private DataRow hdDataRow; #region properties @@ -48,9 +48,9 @@ set { hdDataRow["BootImg"] = value; } } - public VMHardDrive(Data dataIn) - { - data = dataIn; + public VMHardDrive(VMConfig vmConfigIn) + { + vmConfig = vmConfigIn; } #endregion @@ -70,7 +70,7 @@ try { - DataTable hddt = data.DataSet.Tables["HardDisks"]; + DataTable hddt = vmConfig.DataSet.Tables["HardDisks"]; hdDataRow = hddt.NewRow(); hdDataRow["DiskID"] = hddt.Rows.Count; hdDataRow["Name"] = nameIn; @@ -85,8 +85,7 @@ catch (Exception e) { string message = "Failed to populate hard disk database"; - ErrorForm err = new ErrorForm(message, e.Message, e.StackTrace); - err.ShowDialog(); + Debug.LogMessage(message, e.Message, e.StackTrace, true); } return ret; @@ -94,7 +93,7 @@ public void DeleteHardDrive(int diskID) { - DataTable dt = data.DataSet.Tables["HardDisks"]; + DataTable dt = vmConfig.DataSet.Tables["HardDisks"]; //DataRow dr = dt.Rows.Find(diskID); <-- can't seem to apply a primary key?? // workaround for the above foreach (DataRow dr in dt.Rows) @@ -110,14 +109,14 @@ public void LoadHardDrive(int index) { - DataTable hddt = data.DataSet.Tables["HardDisks"]; + DataTable hddt = vmConfig.DataSet.Tables["HardDisks"]; hdDataRow = hddt.Rows[index]; } } public class VirtualMachine { - private Data data; + private VMConfig vmConfig; private DataRow vmDataRow; private ArrayList hardDrives; private ArrayList netCards; @@ -232,8 +231,7 @@ catch (ArgumentException e) { string message = "Failed to get " + key + " value"; - ErrorForm err = new ErrorForm(message, e.Message, e.StackTrace); - err.ShowDialog(); + Debug.LogMessage(message, e.Message, e.StackTrace, true); return 0; } } @@ -247,8 +245,7 @@ catch (ArgumentException e) { string message = "Failed to get " + key + " value"; - ErrorForm err = new ErrorForm(message, e.Message, e.StackTrace); - err.ShowDialog(); + Debug.LogMessage(message, e.Message, e.StackTrace, true); return false; } } @@ -262,8 +259,7 @@ catch (ArgumentException e) { string message = "Failed to get " + key + " value"; - ErrorForm err = new ErrorForm(message, e.Message, e.StackTrace); - err.ShowDialog(); + Debug.LogMessage(message, e.Message, e.StackTrace, true); return string.Empty; } } @@ -277,8 +273,7 @@ catch (ArgumentException e) { string message = "Failed to set " + key + " value"; - ErrorForm err = new ErrorForm(message, e.Message, e.StackTrace); - err.ShowDialog(); + Debug.LogMessage(message, e.Message, e.StackTrace, true); } } @@ -291,8 +286,7 @@ catch (ArgumentException e) { string message = "Failed to set " + key + " value"; - ErrorForm err = new ErrorForm(message, e.Message, e.StackTrace); - err.ShowDialog(); + Debug.LogMessage(message, e.Message, e.StackTrace, true); } } @@ -305,8 +299,7 @@ catch (ArgumentException e) { string message = "Failed to set " + key + " value"; - ErrorForm err = new ErrorForm(message, e.Message, e.StackTrace); - err.ShowDialog(); + Debug.LogMessage(message, e.Message, e.StackTrace, true); } } @@ -325,7 +318,7 @@ try { - DataTable vmdt = data.DataSet.Tables["VMConfig"]; + DataTable vmdt = vmConfig.DataSet.Tables["VMConfig"]; vmDataRow = vmdt.NewRow(); vmDataRow["VirtMachID"] = vmdt.Rows.Count + 1; vmDataRow["Name"] = name; @@ -345,11 +338,11 @@ vmDataRow["FloppyIsoImg"] = string.Empty; vmdt.Rows.Add(vmDataRow); - VMHardDrive vmhd = new VMHardDrive(data); + VMHardDrive vmhd = new VMHardDrive(vmConfig); vmhd.CreateHardDrive("Main Drive", "hda", dir, 768, true); hardDrives.Add(vmhd); - DataTable netdt = data.DataSet.Tables["NetCards"]; + DataTable netdt = vmConfig.DataSet.Tables["NetCards"]; netDataRow = netdt.NewRow(); netDataRow["CardID"] = netdt.Rows.Count + 1; netDataRow["VirtMachID"] = vmDataRow["VirtMachID"]; @@ -366,8 +359,7 @@ catch (Exception e) { string message = "Failed to populate database"; - ErrorForm err = new ErrorForm(message, e.Message, e.StackTrace); - err.ShowDialog(); + Debug.LogMessage(message, e.Message, e.StackTrace, true); } return ret; @@ -384,21 +376,21 @@ { FileStream fs = new FileStream(fileName, FileMode.Open, FileAccess.Read); XmlTextReader xtr = new XmlTextReader(fs); - data.DataSet.ReadXml(xtr, System.Data.XmlReadMode.ReadSchema); + vmConfig.DataSet.ReadXml(xtr, System.Data.XmlReadMode.ReadSchema); xtr.Close(); - DataTable vmdt = data.DataSet.Tables["VMConfig"]; + DataTable vmdt = vmConfig.DataSet.Tables["VMConfig"]; vmDataRow = vmdt.Rows[0]; - DataTable hddt = data.DataSet.Tables["HardDisks"]; + DataTable hddt = vmConfig.DataSet.Tables["HardDisks"]; for (int i = 0; i < hddt.Rows.Count; i++) { - VMHardDrive vmhd = new VMHardDrive(data); + VMHardDrive vmhd = new VMHardDrive(vmConfig); vmhd.LoadHardDrive(i); hardDrives.Add(vmhd); } - DataTable netdt = data.DataSet.Tables["NetCards"]; + DataTable netdt = vmConfig.DataSet.Tables["NetCards"]; foreach (DataRow dr in netdt.Rows) netCards.Add(dr); @@ -421,7 +413,7 @@ 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); + vmConfig.DataSet.WriteXml(xtw, System.Data.XmlWriteMode.WriteSchema); xtw.Close(); } catch (Exception e) @@ -435,8 +427,8 @@ public VirtualMachine() { - data = new Data(); - if (!data.LoadVirtMachData()) + vmConfig = new VMConfig(); + if (!vmConfig.LoadVirtMachData()) MessageBox.Show("Failed to load VM Schema"); hardDrives = new ArrayList(3); @@ -498,7 +490,7 @@ int sizeIn, bool bootImgIn) { - VMHardDrive vmhd = new VMHardDrive(data); + VMHardDrive vmhd = new VMHardDrive(vmConfig); if (vmhd.CreateHardDrive(nameIn, driveIn, pathIn, sizeIn, bootImgIn)) { hardDrives.Add(vmhd); Modified: trunk/tools/RosTE/GUI/qemu.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/qemu.cs?rev=31980&… ============================================================================== --- trunk/tools/RosTE/GUI/qemu.cs (original) +++ trunk/tools/RosTE/GUI/qemu.cs Fri Jan 25 00:33:58 2008 @@ -12,8 +12,34 @@ namespace RosTEGUI { - public class qemu + public class Qemu + { + public enum Platforms + { + x86 = 0, + x86_ISA = 1, + x64 = 2, + x64_ISA = 3, + ARM_integratorcp926 = 4, + ARM_integratorcp1026 = 5, + ARM_versatilepb = 6, + ARM_versatileab = 7, + PPC_g3bw = 8, + PPC_mac99 = 9, + PPC_prep = 10, + Sparc_sun4m = 11 + } + + public Qemu() + { + } + + } + + public class QemuImg { } + + }

16 years, 7 months

[peterw] 31979: - Clarify the LICENSE line in the header of each file for the RosBE.

by peterw＠svn.reactos.org

Author: peterw Date: Fri Jan 25 00:32:58 2008 New Revision: 31979 URL: http://svn.reactos.org/svn/reactos?rev=31979&view=rev Log: - Clarify the LICENSE line in the header of each file for the RosBE. Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE/RosBE-Windows/Root/TimeDate.cmd trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd trunk/tools/RosBE/RosBE-Windows/Root/options.cmd trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd trunk/tools/RosBE/RosBE-Windows/Tools/buildtime.c trunk/tools/RosBE/RosBE-Windows/Tools/chknewer.c trunk/tools/RosBE/RosBE-Windows/Tools/chkslash.c trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c trunk/tools/RosBE/RosBE-Windows/Tools/config/options.h trunk/tools/RosBE/RosBE-Windows/Tools/config/resources.h trunk/tools/RosBE/RosBE-Windows/Tools/echoh.c trunk/tools/RosBE/RosBE-Windows/Tools/flash.c trunk/tools/RosBE/RosBE-Windows/Tools/getdate.c trunk/tools/RosBE/RosBE-Windows/Tools/rquote.c trunk/tools/RosBE/RosBE-Windows/Tools/tee.c trunk/tools/RosBE/Tools/cpucount.c trunk/tools/RosBE/Tools/scut.c Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Bui… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd Fri Jan 25 00:32:58 2008 @@ -1,6 +1,6 @@ :: :: PROJECT: RosBE - ReactOS Build Environment for Windows -:: LICENSE: GPL - See LICENSE.txt in the top level directory. +:: LICENSE: GNU General Public License v2. (see LICENSE.txt) :: FILE: Root/Build.cmd :: PURPOSE: Perform the build of ReactOS. :: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> Modified: trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cle… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd Fri Jan 25 00:32:58 2008 @@ -1,6 +1,6 @@ :: :: PROJECT: RosBE - ReactOS Build Environment for Windows -:: LICENSE: GPL - See LICENSE.txt in the top level directory. +:: LICENSE: GNU General Public License v2. (see LICENSE.txt) :: FILE: Root/Clean.cmd :: PURPOSE: Clean the ReactOS source directory. :: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> Modified: trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Con… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd Fri Jan 25 00:32:58 2008 @@ -1,6 +1,6 @@ :: :: PROJECT: RosBE - ReactOS Build Environment for Windows -:: LICENSE: GPL - See LICENSE.txt in the top level directory. +:: LICENSE: GNU General Public License v2. (see LICENSE.txt) :: FILE: Root/Config.cmd :: PURPOSE: A Basic Config.rbuild Creator for ReactOS. :: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> Modified: trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Hel… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd Fri Jan 25 00:32:58 2008 @@ -1,6 +1,6 @@ :: :: PROJECT: RosBE - ReactOS Build Environment for Windows -:: LICENSE: GPL - See LICENSE.txt in the top level directory. +:: LICENSE: GNU General Public License v2. (see LICENSE.txt) :: FILE: Root/Help.cmd :: PURPOSE: Display help for the commands included with the ReactOS Build Environment. :: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> Modified: trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Min… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd Fri Jan 25 00:32:58 2008 @@ -1,6 +1,6 @@ :: :: PROJECT: RosBE - ReactOS Build Environment for Windows -:: LICENSE: GPL - See LICENSE.txt in the top level directory. +:: LICENSE: GNU General Public License v2. (see LICENSE.txt) :: FILE: Root/MinGW.cmd :: PURPOSE: This script provides/sets up a standard MinGW build environment. :: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd Fri Jan 25 00:32:58 2008 @@ -1,6 +1,6 @@ :: :: PROJECT: RosBE - ReactOS Build Environment for Windows -:: LICENSE: GPL - See LICENSE.txt in the top level directory. +:: LICENSE: GNU General Public License v2. (see LICENSE.txt) :: FILE: Root/RosBE.cmd :: PURPOSE: This script provides/sets up various build environments for :: ReactOS. Currently it provides a GCC 4.1.3 build environment. Modified: trunk/tools/RosBE/RosBE-Windows/Root/TimeDate.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Tim… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/TimeDate.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/TimeDate.cmd Fri Jan 25 00:32:58 2008 @@ -1,6 +1,6 @@ :: :: PROJECT: RosBE - ReactOS Build Environment for Windows -:: LICENSE: GPL - See LICENSE.txt in the top level directory. +:: LICENSE: GNU General Public License v2. (see LICENSE.txt) :: FILE: Root/TimeDate.cmd :: PURPOSE: Get the current date and time for use in our build log's file name. :: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> Modified: trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/chd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd Fri Jan 25 00:32:58 2008 @@ -1,6 +1,6 @@ :: :: PROJECT: RosBE - ReactOS Build Environment for Windows -:: LICENSE: GPL - See LICENSE.txt in the top level directory +:: LICENSE: GNU General Public License v2. (see LICENSE.txt) :: FILE: Root/chdefdir.cmd :: PURPOSE: Tool to change the current working ReactOS source directory :: in RosBE. Modified: trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/chd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd Fri Jan 25 00:32:58 2008 @@ -1,6 +1,6 @@ :: :: PROJECT: RosBE - ReactOS Build Environment for Windows -:: LICENSE: GPL - See LICENSE.txt in the top level directory +:: LICENSE: GNU General Public License v2. (see LICENSE.txt) :: FILE: Root/chdefgcc.cmd :: PURPOSE: Tool to change the current gcc in RosBE. :: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> Modified: trunk/tools/RosBE/RosBE-Windows/Root/options.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/opt… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/options.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/options.cmd Fri Jan 25 00:32:58 2008 @@ -1,6 +1,6 @@ :: :: PROJECT: RosBE - ReactOS Build Environment for Windows -:: LICENSE: GPL - See LICENSE.txt in the top level directory. +:: LICENSE: GNU General Public License v2. (see LICENSE.txt) :: FILE: Root/options.cmd :: PURPOSE: Starts options.exe and restarts RosBE afterwards. :: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> Modified: trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/rel… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd Fri Jan 25 00:32:58 2008 @@ -1,6 +1,6 @@ :: :: PROJECT: RosBE - ReactOS Build Environment for Windows -:: LICENSE: GPL - See LICENSE.txt in the top level directory. +:: LICENSE: GNU General Public License v2. (see LICENSE.txt) :: FILE: Root/reladdr2line.cmd :: PURPOSE: Converts a value to hex and displays it. :: COPYRIGHT: Copyright 2007 Christoph von Wittich <Christoph_vW(a)reactos.org> Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd Fri Jan 25 00:32:58 2008 @@ -1,6 +1,6 @@ :: :: PROJECT: RosBE - ReactOS Build Environment for Windows -:: LICENSE: GPL - See LICENSE.txt in the top level directory. +:: LICENSE: GNU General Public License v2. (see LICENSE.txt) :: FILE: Root/rosbe-gcc-env.cmd :: PURPOSE: Set up the GCC 4.x.x build environment. :: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> Modified: trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/sSV… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd Fri Jan 25 00:32:58 2008 @@ -1,6 +1,6 @@ :: :: PROJECT: RosBE - ReactOS Build Environment for Windows -:: LICENSE: GPL - See LICENSE.txt in the top level directory. +:: LICENSE: GNU General Public License v2. (see LICENSE.txt) :: FILE: Root/sSVN.cmd :: PURPOSE: Integrated SVN Client. :: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> Modified: trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/scu… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd Fri Jan 25 00:32:58 2008 @@ -1,6 +1,6 @@ :: :: PROJECT: RosBE - ReactOS Build Environment for Windows. -:: LICENSE: GPL - See LICENSE.txt in the top level directory. +:: LICENSE: GNU General Public License v2. (see LICENSE.txt) :: FILE: Root/scut.cmd :: PURPOSE: Manages named shortcuts to ReactOS source directories. :: COPYRIGHT: Copyright 2007 Colin Finck <mail(a)colinfinck.de> Modified: trunk/tools/RosBE/RosBE-Windows/Tools/buildtime.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/bu… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/buildtime.c (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/buildtime.c Fri Jan 25 00:32:58 2008 @@ -1,6 +1,6 @@ /* * PROJECT: RosBE - ReactOS Build Environment for Windows. - * LICENSE: GPL - See LICENSE.txt in the top level directory. + * LICENSE: GNU General Public License v2. (see LICENSE.txt) * FILE: Tools/buildtime.c * PURPOSE: Buildtime Counter * COPYRIGHT: Copyright 2007 KJK::Hyperion Modified: trunk/tools/RosBE/RosBE-Windows/Tools/chknewer.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/ch… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/chknewer.c (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/chknewer.c Fri Jan 25 00:32:58 2008 @@ -1,6 +1,6 @@ /* * PROJECT: RosBE - ReactOS Build Environment for Windows. - * LICENSE: GPL - See LICENSE.txt in the top level directory. + * LICENSE: GNU General Public License v2. (see LICENSE.txt) * FILE: Tools/chknewer.c * PURPOSE: Check if a file is newer than another. * COPYRIGHT: Copyright 2007 Peter Ward <dralnix(a)gmail.com> Modified: trunk/tools/RosBE/RosBE-Windows/Tools/chkslash.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/ch… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/chkslash.c (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/chkslash.c Fri Jan 25 00:32:58 2008 @@ -1,6 +1,6 @@ /* * PROJECT: RosBE - ReactOS Build Environment for Windows. - * LICENSE: GPL - See LICENSE.txt in the top level directory. + * LICENSE: GNU General Public License v2. (see LICENSE.txt) * FILE: Tools/chkslash.c * PURPOSE: Checks if a string has a backslash '\' in it or not. * COPYRIGHT: Copyright 2007 Peter Ward <dralnix(a)gmail.com> Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c Fri Jan 25 00:32:58 2008 @@ -1,6 +1,6 @@ /* * PROJECT: RosBE Options Dialog - * LICENSE: GPL - See LICENSE.txt in the top level directory. + * LICENSE: GNU General Public License v2. (see LICENSE.txt) * FILE: Tools/config/options.c * PURPOSE: Configuring RosBE * COPYRIGHT: Copyright 2007 Maarten Bosma Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/options.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/options.h (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/options.h Fri Jan 25 00:32:58 2008 @@ -1,6 +1,6 @@ /* * PROJECT: RosBE Options Dialog - * LICENSE: GPL - See LICENSE.txt in the top level directory. + * LICENSE: GNU General Public License v2. (see LICENSE.txt) * FILE: Tools/config/options.h * PURPOSE: Configuring RosBE * COPYRIGHT: Copyright 2007 Maarten Bosma Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/resources.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/resources.h (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/resources.h Fri Jan 25 00:32:58 2008 @@ -1,6 +1,6 @@ /* * PROJECT: RosBE Options Dialog - * LICENSE: GPL - See LICENSE.txt in the top level directory. + * LICENSE: GNU General Public License v2. (see LICENSE.txt) * FILE: Tools/config/resources.h * PURPOSE: Configuring RosBE * COPYRIGHT: Copyright 2007 Maarten Bosma Modified: trunk/tools/RosBE/RosBE-Windows/Tools/echoh.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/ec… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/echoh.c (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/echoh.c Fri Jan 25 00:32:58 2008 @@ -1,6 +1,6 @@ /* * PROJECT: RosBE - ReactOS Build Environment for Windows. - * LICENSE: GPL - See LICENSE.txt in the top level directory. + * LICENSE: GNU General Public License v2. (see LICENSE.txt) * FILE: Tools/echoh.c * PURPOSE: Converts a value to hex and displays it * COPYRIGHT: Copyright 2007 Christoph von Wittich <Christoph_vW(a)reactos.org> Modified: trunk/tools/RosBE/RosBE-Windows/Tools/flash.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/fl… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/flash.c (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/flash.c Fri Jan 25 00:32:58 2008 @@ -1,6 +1,6 @@ /* * PROJECT: RosBE - ReactOS Build Environment for Windows. - * LICENSE: GPL - See LICENSE.txt in the top level directory. + * LICENSE: GNU General Public License v2. (see LICENSE.txt) * FILE: Tools/flash.c * PURPOSE: Taskbar Flasher * COPYRIGHT: Copyright 2007 Ged Murphy <gedmurphy(a)reactos.org> Modified: trunk/tools/RosBE/RosBE-Windows/Tools/getdate.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/ge… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/getdate.c (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/getdate.c Fri Jan 25 00:32:58 2008 @@ -1,6 +1,6 @@ /* * PROJECT: RosBE - ReactOS Build Environment for Windows. - * LICENSE: GPL - See LICENSE.txt in the top level directory. + * LICENSE: GNU General Public License v2. (see LICENSE.txt) * FILE: Tools/getdate.c * PURPOSE: Returns System Date * COPYRIGHT: Copyright 2007 Peter Ward <dralnix(a)gmail.com> Modified: trunk/tools/RosBE/RosBE-Windows/Tools/rquote.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/rq… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/rquote.c (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/rquote.c Fri Jan 25 00:32:58 2008 @@ -1,6 +1,6 @@ /* * PROJECT: RosBE - ReactOS Build Environment for Windows. - * LICENSE: GPL - See LICENSE.txt in the top level directory. + * LICENSE: GNU General Public License v2. (see LICENSE.txt) * FILE: Tools/rquote.c * PURPOSE: Removes all quotes from a string. * COPYRIGHT: Copyright 2007 Peter Ward <dralnix(a)gmail.com> Modified: trunk/tools/RosBE/RosBE-Windows/Tools/tee.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/te… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/tee.c (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/tee.c Fri Jan 25 00:32:58 2008 @@ -1,6 +1,6 @@ /* * PROJECT: RosBE - ReactOS Build Environment for Windows. - * LICENSE: GPL - See LICENSE.txt in the top level directory. + * LICENSE: GNU General Public License v2. (see LICENSE.txt) * FILE: Tools/tee.c * PURPOSE: Spit stdin to stdout and a file. * COPYRIGHT: Copyright 2007 Peter Ward <dralnix(a)gmail.com> Modified: trunk/tools/RosBE/Tools/cpucount.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Tools/cpucount.c?rev=3… ============================================================================== --- trunk/tools/RosBE/Tools/cpucount.c (original) +++ trunk/tools/RosBE/Tools/cpucount.c Fri Jan 25 00:32:58 2008 @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Build Environment Tools - * LICENSE: GPL - See LICENSE.txt in the top level directory. + * LICENSE: GNU General Public License v2. (see LICENSE.txt) * FILE: Tools/cpucount.c * PURPOSE: CPU Core Counter * COPYRIGHT: Copyright 2007 Christoph von Wittich <Christoph_vW(a)reactos.org> Modified: trunk/tools/RosBE/Tools/scut.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Tools/scut.c?rev=31979… ============================================================================== --- trunk/tools/RosBE/Tools/scut.c (original) +++ trunk/tools/RosBE/Tools/scut.c Fri Jan 25 00:32:58 2008 @@ -1,6 +1,6 @@ /* * PROJECT: RosBE - ReactOS Build Environment for Windows. - * LICENSE: GPL - See LICENSE.txt in the top level directory. + * LICENSE: GNU General Public License v2. (see LICENSE.txt) * FILE: Tools/scut.c * PURPOSE: Manages named shortcuts to ReactOS source directories. * COPYRIGHT: Copyright 2007 Peter Ward <dralnix(a)gmail.com>

16 years, 7 months

[cwittich] 31978: remove statement with no effect

by cwittich＠svn.reactos.org

Author: cwittich Date: Thu Jan 24 23:47:56 2008 New Revision: 31978 URL: http://svn.reactos.org/svn/reactos?rev=31978&view=rev Log: remove statement with no effect Modified: trunk/reactos/dll/win32/kernel32/mem/local.c Modified: trunk/reactos/dll/win32/kernel32/mem/local.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/loc… ============================================================================== --- trunk/reactos/dll/win32/kernel32/mem/local.c (original) +++ trunk/reactos/dll/win32/kernel32/mem/local.c Thu Jan 24 23:47:56 2008 @@ -254,8 +254,6 @@ NTAPI LocalLock(HLOCAL hMem) { - /* This is the same as a GlobalLock, assuming these never change */ - ASSERT(LMEM_LOCKCOUNT == GMEM_LOCKCOUNT); return GlobalLock(hMem); }

16 years, 7 months

[cwittich] 31977: fix some warnings

by cwittich＠svn.reactos.org

Author: cwittich Date: Thu Jan 24 23:40:57 2008 New Revision: 31977 URL: http://svn.reactos.org/svn/reactos?rev=31977&view=rev Log: fix some warnings Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c trunk/reactos/dll/directx/ddraw/Surface/surface_main.c trunk/reactos/dll/directx/ddraw/rosdraw.h Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c Thu Jan 24 23:40:57 2008 @@ -474,7 +474,7 @@ Main_DirectDraw_CreateSurface4(LPDDRAWI_DIRECTDRAW_INT This, LPDDSURFACEDESC2 pDDSD, LPDDRAWI_DDRAWSURFACE_INT *ppSurf, IUnknown *pUnkOuter) { - HRESULT ret; + HRESULT ret = DD_OK; DX_WINDBG_trace(); EnterCriticalSection(&ddcs); 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 Thu Jan 24 23:40:57 2008 @@ -60,10 +60,10 @@ HRESULT WINAPI Main_DDrawSurface_QueryInterface(LPDDRAWI_DDRAWSURFACE_INT This, REFIID riid, LPVOID* ppObj) { - DX_WINDBG_trace(); HRESULT retVal = DD_OK; *ppObj = NULL; + DX_WINDBG_trace(); _SEH_TRY { @@ -394,7 +394,7 @@ DX_WINDBG_trace(); - DX_WINDBG_trace_res( This->lpLcl->lpGbl->wWidth, This->lpLcl->lpGbl->wHeight, This->lpLcl->lpGbl->lPitch, 0); + DX_WINDBG_trace_res( (DWORD)This->lpLcl->lpGbl->wWidth, (DWORD)This->lpLcl->lpGbl->wHeight, (DWORD)This->lpLcl->lpGbl->lPitch, (DWORD) 0); if (events != NULL) { @@ -460,7 +460,7 @@ pDDSD->lpSurface = (LPVOID) mdLock.lpSurfData; - pDDSD->dwHeight =This->lpLcl->lpGbl->wHeight; + pDDSD->dwHeight = This->lpLcl->lpGbl->wHeight; pDDSD->dwWidth = This->lpLcl->lpGbl->wWidth; pDDSD->ddpfPixelFormat.dwRGBBitCount = This->lpLcl->lpGbl->lpDD->lpModeInfo->dwBPP;// .lpModeInfo->dwBPP; //This->lpLcl->lpGbl->lPitch/ 8; 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 Thu Jan 24 23:40:57 2008 @@ -269,7 +269,7 @@ if (firstcallxx) \ { \ char buffer[1024]; \ - sprintf ( buffer, "Setmode have been req width=%d, height=%d bpp=%d freq = %d\n",width,height,bpp, freq); \ + sprintf ( buffer, "Setmode have been req width=%ld, height=%ld bpp=%ld freq = %ld\n",width,height,bpp, freq); \ OutputDebugStringA(buffer); \ firstcallxx = TRUE; \ }

16 years, 7 months

[cwittich] 31976: fix building with gcc 4.3.0

by cwittich＠svn.reactos.org

Author: cwittich Date: Thu Jan 24 21:29:50 2008 New Revision: 31976 URL: http://svn.reactos.org/svn/reactos?rev=31976&view=rev Log: fix building with gcc 4.3.0 Modified: trunk/reactos/base/applications/regedit/childwnd.c trunk/reactos/base/applications/regedit/hexedit.c Modified: trunk/reactos/base/applications/regedit/childwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/childwnd.c (original) +++ trunk/reactos/base/applications/regedit/childwnd.c Thu Jan 24 21:29:50 2008 @@ -21,6 +21,7 @@ #include <regedit.h> ChildWnd* g_pChildWnd; +static int last_split; HBITMAP SizingPattern = 0; HBRUSH SizingBrush = 0; static TCHAR Suggestions[256]; @@ -95,6 +96,24 @@ } /******************************************************************************* + * finish_splitbar [internal] + * + * make the splitbar invisible and resize the windows + * (helper for ChildWndProc) + */ +static void finish_splitbar(HWND hWnd, int x) +{ + RECT rt; + + draw_splitbar(hWnd, last_split); + last_split = -1; + GetClientRect(hWnd, &rt); + g_pChildWnd->nSplitPos = x; + ResizeWnd(g_pChildWnd, rt.right, rt.bottom); + ReleaseCapture(); +} + +/******************************************************************************* * * FUNCTION: _CmdWndProc(HWND, unsigned, WORD, LONG) * @@ -305,7 +324,6 @@ */ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { - static int last_split; BOOL Result; ChildWnd* pChildWnd = g_pChildWnd; @@ -376,10 +394,9 @@ break; case WM_LBUTTONDOWN: { RECT rt; - POINTS pt; - pt = MAKEPOINTS(lParam); + int x = (short)LOWORD(lParam); GetClientRect(hWnd, &rt); - if (pt.x>=pChildWnd->nSplitPos-SPLIT_WIDTH/2 && pt.x<pChildWnd->nSplitPos+SPLIT_WIDTH/2+1) { + if (x>=pChildWnd->nSplitPos-SPLIT_WIDTH/2 && x<pChildWnd->nSplitPos+SPLIT_WIDTH/2+1) { last_split = pChildWnd->nSplitPos; draw_splitbar(hWnd, last_split); SetCapture(hWnd); @@ -388,17 +405,9 @@ } case WM_LBUTTONUP: + case WM_RBUTTONDOWN: if (GetCapture() == hWnd) { - RECT rt; - POINTS pt; - pt = MAKEPOINTS(lParam); - GetClientRect(hWnd, &rt); - pt.x = (SHORT) min(max(pt.x, SPLIT_MIN), rt.right - SPLIT_MIN); - draw_splitbar(hWnd, last_split); - last_split = -1; - pChildWnd->nSplitPos = pt.x; - ResizeWnd(pChildWnd, rt.right, rt.bottom); - ReleaseCapture(); + finish_splitbar(hWnd, LOWORD(lParam)); } break; @@ -425,7 +434,7 @@ HDC hdc; RECT rt; HGDIOBJ OldObj; - POINTS pt; + int x = LOWORD(lParam); if(!SizingPattern) { const DWORD Pattern[4] = {0x5555AAAA, 0x5555AAAA, 0x5555AAAA, 0x5555AAAA}; @@ -436,19 +445,18 @@ SizingBrush = CreatePatternBrush(SizingPattern); } - pt = MAKEPOINTS(lParam); GetClientRect(hWnd, &rt); - pt.x = (SHORT) min(max(pt.x, SPLIT_MIN), rt.right - SPLIT_MIN); - if(last_split != pt.x) + x = (SHORT) min(max(x, SPLIT_MIN), rt.right - SPLIT_MIN); + if(last_split != x) { rt.left = last_split-SPLIT_WIDTH/2; rt.right = last_split+SPLIT_WIDTH/2+1; hdc = GetDC(hWnd); OldObj = SelectObject(hdc, SizingBrush); PatBlt(hdc, rt.left, rt.top, rt.right - rt.left, rt.bottom - rt.top, PATINVERT); - last_split = pt.x; - rt.left = pt.x-SPLIT_WIDTH/2; - rt.right = pt.x+SPLIT_WIDTH/2+1; + last_split = x; + rt.left = x-SPLIT_WIDTH/2; + rt.right = x+SPLIT_WIDTH/2+1; PatBlt(hdc, rt.left, rt.top, rt.right - rt.left, rt.bottom - rt.top, PATINVERT); SelectObject(hdc, OldObj); ReleaseDC(hWnd, hdc); @@ -575,7 +583,8 @@ { int i, cnt; BOOL IsDefault; - pt = MAKEPOINTS(lParam); + pt.x = LOWORD(lParam); + pt.y = HIWORD(lParam); cnt = ListView_GetSelectedCount(pChildWnd->hListWnd); i = ListView_GetNextItem(pChildWnd->hListWnd, -1, LVNI_FOCUSED | LVNI_SELECTED); FixPointIfContext(&pt, pChildWnd->hListWnd); @@ -612,7 +621,8 @@ int iLastPos; WORD wID; - pt = MAKEPOINTS(lParam); + pt.x = LOWORD(lParam); + pt.y = HIWORD(lParam); hti.pt.x = pt.x; hti.pt.y = pt.y; ScreenToClient(pChildWnd->hTreeWnd, &hti.pt); Modified: trunk/reactos/base/applications/regedit/hexedit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/hexedit.c (original) +++ trunk/reactos/base/applications/regedit/hexedit.c Thu Jan 24 21:29:50 2008 @@ -869,6 +869,7 @@ HexEditWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { PHEXEDIT_DATA hed; + POINTS p; hed = (PHEXEDIT_DATA)(LONG_PTR)GetWindowLongPtr(hWnd, (DWORD_PTR)0); switch(uMsg) @@ -889,7 +890,11 @@ return HEXEDIT_WM_SIZE(hed, (DWORD)wParam, LOWORD(lParam), HIWORD(lParam)); case WM_LBUTTONDOWN: - return HEXEDIT_WM_LBUTTONDOWN(hed, (INT)wParam, MAKEPOINTS(lParam)); + { + p.x = LOWORD(lParam); + p.y = HIWORD(lParam); + return HEXEDIT_WM_LBUTTONDOWN(hed, (INT)wParam, p); + } case WM_MOUSEWHEEL: { @@ -900,7 +905,9 @@ delta -= (SHORT)HIWORD(wParam); if(abs(delta) >= WHEEL_DELTA && nScrollLines != 0) { - return HEXEDIT_WM_MOUSEWHEEL(hed, nScrollLines * (delta / WHEEL_DELTA), LOWORD(wParam), &MAKEPOINTS(lParam)); + p.x = LOWORD(lParam); + p.y = HIWORD(lParam); + return HEXEDIT_WM_MOUSEWHEEL(hed, nScrollLines * (delta / WHEEL_DELTA), LOWORD(wParam), &p); } break; }

16 years, 7 months

[cwittich] 31975: fix a typo

by cwittich＠svn.reactos.org

Author: cwittich Date: Thu Jan 24 20:45:52 2008 New Revision: 31975 URL: http://svn.reactos.org/svn/reactos?rev=31975&view=rev Log: fix a typo Modified: trunk/reactos/drivers/directx/dxg/dxg_int.h Modified: trunk/reactos/drivers/directx/dxg/dxg_int.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/directx/dxg/dxg_in… ============================================================================== --- trunk/reactos/drivers/directx/dxg/dxg_int.h (original) +++ trunk/reactos/drivers/directx/dxg/dxg_int.h Thu Jan 24 20:45:52 2008 @@ -64,9 +64,6 @@ DD_SURFACE_LOCAL Surfacelcl; } EDD_SURFACE_LOCAL, *PEDD_SURFACE_LOCAL; - - - /* exported functions */ NTSTATUS DriverEntry(IN PVOID Context1, IN PVOID Context2); NTSTATUS GsDriverEntry(IN PVOID Context1, IN PVOID Context2); @@ -85,21 +82,17 @@ extern PEPROCESS gpepSession; extern PLARGE_INTEGER gpLockShortDelay; - - /* Driver list export functions */ DWORD STDCALL DxDxgGenericThunk(ULONG_PTR ulIndex, ULONG_PTR ulHandle, SIZE_T *pdwSizeOfPtr1, PVOID pvPtr1, SIZE_T *pdwSizeOfPtr2, PVOID pvPtr2); DWORD STDCALL DxDdIoctl(ULONG ulIoctl, PVOID pBuffer, ULONG ulBufferSize); PDD_SURFACE_LOCAL STDCALL DxDdLockDirectDrawSurface(HANDLE hDdSurface); BOOL STDCALL DxDdUnlockDirectDrawSurface(PDD_SURFACE_LOCAL pSurface); -/* Internel functions */ +/* Internal functions */ BOOL FASTCALL VerifyObjectOwner(PDD_ENTRY pEntry); BOOL FASTCALL DdHmgCreate(); BOOL FASTCALL DdHmgDestroy(); PVOID FASTCALL DdHmgLock( HANDLE DdHandle, UCHAR ObjectType, BOOLEAN LockOwned); - - /* define stuff */ #define drvDxEngLockDC gpEngFuncs[DXENG_INDEX_DxEngLockDC]

16 years, 7 months

[cwittich] 31974: fix index out of bounds warning

by cwittich＠svn.reactos.org

Author: cwittich Date: Thu Jan 24 20:27:38 2008 New Revision: 31974 URL: http://svn.reactos.org/svn/reactos?rev=31974&view=rev Log: fix index out of bounds warning Modified: trunk/reactos/drivers/filesystems/vfat/dirwr.c Modified: trunk/reactos/drivers/filesystems/vfat/dirwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/vfat/d… ============================================================================== --- trunk/reactos/drivers/filesystems/vfat/dirwr.c (original) +++ trunk/reactos/drivers/filesystems/vfat/dirwr.c Thu Jan 24 20:27:38 2008 @@ -329,7 +329,7 @@ i++; for (j = 8; j < 11 && aName[i]; j++, i++) { - DirContext.DirEntry.Fat.Filename[j] = aName[i]; + DirContext.DirEntry.Fat.Ext[j - 8] = aName[i]; } } if (DirContext.DirEntry.Fat.Filename[0] == 0xe5)

16 years, 7 months

[cwittich] 31973: do not redefine _pctype

by cwittich＠svn.reactos.org

Author: cwittich Date: Thu Jan 24 20:26:18 2008 New Revision: 31973 URL: http://svn.reactos.org/svn/reactos?rev=31973&view=rev Log: do not redefine _pctype Modified: trunk/reactos/include/crt/ctype.h Modified: trunk/reactos/include/crt/ctype.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/ctype.h?rev=31… ============================================================================== --- trunk/reactos/include/crt/ctype.h (original) +++ trunk/reactos/include/crt/ctype.h Thu Jan 24 20:26:18 2008 @@ -106,7 +106,7 @@ #endif /* __DECLSPEC_SUPPORTED */ #endif /* MB_CUR_MAX */ - +#ifndef _WCTYPE_H_ #ifdef __DECLSPEC_SUPPORTED # if __MSVCRT_VERSION__ <= 0x0700 __MINGW_IMPORT unsigned short _ctype[]; @@ -131,6 +131,7 @@ # define _pctype (*_imp___pctype_dll) # endif /* CRTDLL */ #endif /* __DECLSPEC_SUPPORTED */ +#endif /* * Use inlines here rather than macros, because macros will upset

16 years, 7 months

← Newer
1
...
7
8
9
10
11
12
13
...
54
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2008