Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gedmurphy] 26823: remove stray file
by gedmurphy＠svn.reactos.org 17 May '07

17 May '07

Author: gedmurphy Date: Thu May 17 19:07:33 2007 New Revision: 26823 URL: http://svn.reactos.org/svn/reactos?rev=26823&view=rev Log: remove stray file Removed: trunk/tools/Qemu GUI/Qemu GUI.csproj Removed: trunk/tools/Qemu GUI/Qemu GUI.csproj URL: http://svn.reactos.org/svn/reactos/trunk/tools/Qemu%20GUI/Qemu%20GUI.csproj… ============================================================================== --- trunk/tools/Qemu GUI/Qemu GUI.csproj (original) +++ trunk/tools/Qemu GUI/Qemu GUI.csproj (removed) @@ -1,127 +1,0 @@ -ï»¿<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <PropertyGroup> - <ProjectType>Local</ProjectType> - <ProductVersion>8.0.50727</ProductVersion> - <SchemaVersion>2.0</SchemaVersion> - <ProjectGuid>{88020C53-D88A-4488-A479-E7ED0310D3D3}</ProjectGuid> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ApplicationIcon>App.ico</ApplicationIcon> - <AssemblyKeyContainerName> - </AssemblyKeyContainerName> - <AssemblyName>Qemu GUI</AssemblyName> - <AssemblyOriginatorKeyFile> - </AssemblyOriginatorKeyFile> - <DefaultClientScript>JScript</DefaultClientScript> - <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> - <DefaultTargetSchema>IE50</DefaultTargetSchema> - <DelaySign>false</DelaySign> - <OutputType>WinExe</OutputType> - <RootNamespace>Qemu_GUI</RootNamespace> - <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent> - <StartupObject> - </StartupObject> - <FileUpgradeFlags> - </FileUpgradeFlags> - <UpgradeBackupLocation> - </UpgradeBackupLocation> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - <OutputPath>bin\Debug\</OutputPath> - <AllowUnsafeBlocks>false</AllowUnsafeBlocks> - <BaseAddress>285212672</BaseAddress> - <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow> - <ConfigurationOverrideFile> - </ConfigurationOverrideFile> - <DefineConstants>DEBUG;TRACE</DefineConstants> - <DocumentationFile> - </DocumentationFile> - <DebugSymbols>true</DebugSymbols> - <FileAlignment>4096</FileAlignment> - <NoStdLib>false</NoStdLib> - <NoWarn> - </NoWarn> - <Optimize>false</Optimize> - <RegisterForComInterop>false</RegisterForComInterop> - <RemoveIntegerChecks>false</RemoveIntegerChecks> - <TreatWarningsAsErrors>false</TreatWarningsAsErrors> - <WarningLevel>4</WarningLevel> - <DebugType>full</DebugType> - <ErrorReport>prompt</ErrorReport> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - <OutputPath>bin\Release\</OutputPath> - <AllowUnsafeBlocks>false</AllowUnsafeBlocks> - <BaseAddress>285212672</BaseAddress> - <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow> - <ConfigurationOverrideFile> - </ConfigurationOverrideFile> - <DefineConstants>TRACE</DefineConstants> - <DocumentationFile> - </DocumentationFile> - <DebugSymbols>false</DebugSymbols> - <FileAlignment>4096</FileAlignment> - <NoStdLib>false</NoStdLib> - <NoWarn> - </NoWarn> - <Optimize>true</Optimize> - <RegisterForComInterop>false</RegisterForComInterop> - <RemoveIntegerChecks>false</RemoveIntegerChecks> - <TreatWarningsAsErrors>false</TreatWarningsAsErrors> - <WarningLevel>4</WarningLevel> - <DebugType>none</DebugType> - <ErrorReport>prompt</ErrorReport> - </PropertyGroup> - <ItemGroup> - <Reference Include="System"> - <Name>System</Name> - </Reference> - <Reference Include="System.Data"> - <Name>System.Data</Name> - </Reference> - <Reference Include="System.Drawing"> - <Name>System.Drawing</Name> - </Reference> - <Reference Include="System.Windows.Forms"> - <Name>System.Windows.Forms</Name> - </Reference> - <Reference Include="System.Xml"> - <Name>System.XML</Name> - </Reference> - </ItemGroup> - <ItemGroup> - <Content Include="App.ico" /> - <Content Include="Icon1.ico" /> - <None Include="res\audio-volume-high.gif" /> - <Compile Include="AssemblyInfo.cs"> - <SubType>Code</SubType> - </Compile> - <Compile Include="frmMain.cs"> - <SubType>Form</SubType> - </Compile> - <Compile Include="Network.cs" /> - <Compile Include="Properties\Resources.Designer.cs"> - <AutoGen>True</AutoGen> - <DesignTime>True</DesignTime> - <DependentUpon>Resources.resx</DependentUpon> - </Compile> - <Compile Include="Data.cs" /> - <Compile Include="Runner.cs" /> - <EmbeddedResource Include="frmMain.resx"> - <DependentUpon>frmMain.cs</DependentUpon> - <SubType>Designer</SubType> - </EmbeddedResource> - <EmbeddedResource Include="Properties\Resources.resx"> - <SubType>Designer</SubType> - <Generator>ResXFileCodeGenerator</Generator> - <LastGenOutput>Resources.Designer.cs</LastGenOutput> - </EmbeddedResource> - </ItemGroup> - <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> - <PropertyGroup> - <PreBuildEvent> - </PreBuildEvent> - <PostBuildEvent> - </PostBuildEvent> - </PropertyGroup> -</Project>

1 0

[ekohl] 26822: - Update WPP and fix the resulting bugs because wpp_find_include has changed. - Add notes to wpp.mak about how to build lex.yy.c, ppy.tab.c and ppy.tab.h manually.
by ekohl＠svn.reactos.org 17 May '07

17 May '07

Author: ekohl Date: Thu May 17 18:47:37 2007 New Revision: 26822 URL: http://svn.reactos.org/svn/reactos?rev=26822&view=rev Log: - Update WPP and fix the resulting bugs because wpp_find_include has changed. - Add notes to wpp.mak about how to build lex.yy.c, ppy.tab.c and ppy.tab.h manually. Modified: trunk/reactos/include/reactos/wine/wpp.h trunk/reactos/tools/widl/ChangeLog trunk/reactos/tools/widl/lex.yy.c trunk/reactos/tools/widl/parser.l trunk/reactos/tools/widl/typelib.c trunk/reactos/tools/wpp/lex.yy.c trunk/reactos/tools/wpp/ppl.l trunk/reactos/tools/wpp/ppy.tab.c trunk/reactos/tools/wpp/ppy.tab.h trunk/reactos/tools/wpp/ppy.y trunk/reactos/tools/wpp/preproc.c trunk/reactos/tools/wpp/wpp.c trunk/reactos/tools/wpp/wpp.mak trunk/reactos/tools/wpp/wpp_private.h trunk/reactos/tools/wrc/parser.tab.c trunk/reactos/tools/wrc/parser.y [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/include/reactos/wine/wpp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wpp.h… Modified: trunk/reactos/tools/widl/ChangeLog URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/ChangeLog?rev=2… Modified: trunk/reactos/tools/widl/lex.yy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/lex.yy.c?rev=26… Modified: trunk/reactos/tools/widl/parser.l URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.l?rev=26… Modified: trunk/reactos/tools/widl/typelib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typelib.c?rev=2… Modified: trunk/reactos/tools/wpp/lex.yy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wpp/lex.yy.c?rev=268… Modified: trunk/reactos/tools/wpp/ppl.l URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wpp/ppl.l?rev=26822&… Modified: trunk/reactos/tools/wpp/ppy.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wpp/ppy.tab.c?rev=26… Modified: trunk/reactos/tools/wpp/ppy.tab.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wpp/ppy.tab.h?rev=26… Modified: trunk/reactos/tools/wpp/ppy.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wpp/ppy.y?rev=26822&… Modified: trunk/reactos/tools/wpp/preproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wpp/preproc.c?rev=26… Modified: trunk/reactos/tools/wpp/wpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wpp/wpp.c?rev=26822&… Modified: trunk/reactos/tools/wpp/wpp.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wpp/wpp.mak?rev=2682… Modified: trunk/reactos/tools/wpp/wpp_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wpp/wpp_private.h?re… Modified: trunk/reactos/tools/wrc/parser.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/parser.tab.c?rev… Modified: trunk/reactos/tools/wrc/parser.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/parser.y?rev=268…

1 0

[gedmurphy] 26821: Add some more design work on the settings form
by gedmurphy＠svn.reactos.org 17 May '07

17 May '07

Author: gedmurphy Date: Thu May 17 18:44:52 2007 New Revision: 26821 URL: http://svn.reactos.org/svn/reactos?rev=26821&view=rev Log: Add some more design work on the settings form Modified: trunk/tools/RosTE/GUI/MainForm.cs trunk/tools/RosTE/GUI/SettingsForm.Designer.cs trunk/tools/RosTE/GUI/SettingsForm.cs Modified: trunk/tools/RosTE/GUI/MainForm.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/MainForm.cs?rev=26… ============================================================================== --- trunk/tools/RosTE/GUI/MainForm.cs (original) +++ trunk/tools/RosTE/GUI/MainForm.cs Thu May 17 18:44:52 2007 @@ -29,16 +29,16 @@ private void MainMenuHelpAbout_Click(object sender, EventArgs e) { - AboutForm Dlg = new AboutForm(); - Dlg.StartPosition = FormStartPosition.CenterScreen; - Dlg.Show(); + AboutForm dlg = new AboutForm(); + dlg.StartPosition = FormStartPosition.CenterScreen; + dlg.Show(); } private void ImageListView_DoubleClick(object sender, EventArgs e) { - SettingsForm SetFrm = new SettingsForm(); - SetFrm.StartPosition = FormStartPosition.CenterScreen; - SetFrm.Show(); + SettingsForm setFrm = new SettingsForm(); + setFrm.StartPosition = FormStartPosition.CenterScreen; + setFrm.Show(); } private void toolbarExit_Click(object sender, EventArgs e) Modified: trunk/tools/RosTE/GUI/SettingsForm.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/SettingsForm.Desig… ============================================================================== --- trunk/tools/RosTE/GUI/SettingsForm.Designer.cs (original) +++ trunk/tools/RosTE/GUI/SettingsForm.Designer.cs Thu May 17 18:44:52 2007 @@ -28,46 +28,399 @@ /// </summary> private void InitializeComponent() { - this.listboxSelection = new System.Windows.Forms.ListBox(); + this.selectionLstBox = new System.Windows.Forms.ListBox(); + this.baseContainerPanel = new System.Windows.Forms.Panel(); + this.tempDesignSheetTab = new System.Windows.Forms.TabControl(); + this.tabPage1 = new System.Windows.Forms.TabPage(); + this.generalPanel = new System.Windows.Forms.Panel(); + this.generalGrpBox = new System.Windows.Forms.GroupBox(); + this.tabPage2 = new System.Windows.Forms.TabPage(); + this.pathsPanel = new System.Windows.Forms.Panel(); + this.pathsGrpBox = new System.Windows.Forms.GroupBox(); + this.tabPage3 = new System.Windows.Forms.TabPage(); + this.drivesPanel = new System.Windows.Forms.Panel(); + this.drivesGrpBox = new System.Windows.Forms.GroupBox(); + this.tabPage4 = new System.Windows.Forms.TabPage(); + this.networkPanel = new System.Windows.Forms.Panel(); + this.networkGrpBox = new System.Windows.Forms.GroupBox(); + this.tabPage5 = new System.Windows.Forms.TabPage(); + this.ioPanel = new System.Windows.Forms.Panel(); + this.ioGrpBox = new System.Windows.Forms.GroupBox(); + this.tabPage6 = new System.Windows.Forms.TabPage(); + this.mountPanel = new System.Windows.Forms.Panel(); + this.mountGrpBox = new System.Windows.Forms.GroupBox(); + this.tabPage7 = new System.Windows.Forms.TabPage(); + this.debugPanel = new System.Windows.Forms.Panel(); + this.debugGrpBox = new System.Windows.Forms.GroupBox(); + this.settingsOKBtn = new System.Windows.Forms.Button(); + this.settingsCancelBtn = new System.Windows.Forms.Button(); + this.settingsApplyBtn = new System.Windows.Forms.Button(); + this.settingsHelpBtn = new System.Windows.Forms.Button(); + this.baseContainerPanel.SuspendLayout(); + this.tempDesignSheetTab.SuspendLayout(); + this.tabPage1.SuspendLayout(); + this.generalPanel.SuspendLayout(); + this.tabPage2.SuspendLayout(); + this.pathsPanel.SuspendLayout(); + this.tabPage3.SuspendLayout(); + this.drivesPanel.SuspendLayout(); + this.tabPage4.SuspendLayout(); + this.networkPanel.SuspendLayout(); + this.tabPage5.SuspendLayout(); + this.ioPanel.SuspendLayout(); + this.tabPage6.SuspendLayout(); + this.mountPanel.SuspendLayout(); + this.tabPage7.SuspendLayout(); + this.debugPanel.SuspendLayout(); this.SuspendLayout(); // - // listboxSelection - // - this.listboxSelection.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.listboxSelection.Cursor = System.Windows.Forms.Cursors.Hand; - this.listboxSelection.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; - this.listboxSelection.FormattingEnabled = true; - this.listboxSelection.ItemHeight = 45; - this.listboxSelection.Items.AddRange(new object[] { - "test1", - "test2", - "test3", - "test4", - "test5", - "test6", - "test7", - "test8"}); - this.listboxSelection.Location = new System.Drawing.Point(12, 12); - this.listboxSelection.Name = "listboxSelection"; - this.listboxSelection.Size = new System.Drawing.Size(74, 362); - this.listboxSelection.TabIndex = 0; - this.listboxSelection.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.listboxSelection_DrawItem); - // - // SettingsForm + // selectionLstBox + // + this.selectionLstBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.selectionLstBox.Cursor = System.Windows.Forms.Cursors.Hand; + this.selectionLstBox.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; + this.selectionLstBox.FormattingEnabled = true; + this.selectionLstBox.ItemHeight = 45; + this.selectionLstBox.Items.AddRange(new object[] { + "General", + "Paths", + "Drives", + "Network", + "I/O", + "Mount", + "Debug"}); + this.selectionLstBox.Location = new System.Drawing.Point(12, 12); + this.selectionLstBox.Name = "selectionLstBox"; + this.selectionLstBox.Size = new System.Drawing.Size(74, 362); + this.selectionLstBox.TabIndex = 0; + this.selectionLstBox.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.listboxSelection_DrawItem); + this.selectionLstBox.SelectedIndexChanged += new System.EventHandler(this.listboxSelection_SelectedIndexChanged); + // + // baseContainerPanel + // + this.baseContainerPanel.Controls.Add(this.tempDesignSheetTab); + this.baseContainerPanel.Location = new System.Drawing.Point(92, 6); + this.baseContainerPanel.Name = "baseContainerPanel"; + this.baseContainerPanel.Size = new System.Drawing.Size(297, 396); + this.baseContainerPanel.TabIndex = 2; + // + // tempDesignSheetTab + // + this.tempDesignSheetTab.Controls.Add(this.tabPage1); + this.tempDesignSheetTab.Controls.Add(this.tabPage2); + this.tempDesignSheetTab.Controls.Add(this.tabPage3); + this.tempDesignSheetTab.Controls.Add(this.tabPage4); + this.tempDesignSheetTab.Controls.Add(this.tabPage5); + this.tempDesignSheetTab.Controls.Add(this.tabPage6); + this.tempDesignSheetTab.Controls.Add(this.tabPage7); + this.tempDesignSheetTab.Location = new System.Drawing.Point(0, 0); + this.tempDesignSheetTab.Name = "tempDesignSheetTab"; + this.tempDesignSheetTab.SelectedIndex = 0; + this.tempDesignSheetTab.Size = new System.Drawing.Size(294, 393); + this.tempDesignSheetTab.TabIndex = 1; + // + // tabPage1 + // + this.tabPage1.Controls.Add(this.generalPanel); + this.tabPage1.Location = new System.Drawing.Point(4, 22); + this.tabPage1.Name = "tabPage1"; + this.tabPage1.Padding = new System.Windows.Forms.Padding(3); + this.tabPage1.Size = new System.Drawing.Size(286, 367); + this.tabPage1.TabIndex = 0; + this.tabPage1.Text = "General"; + this.tabPage1.UseVisualStyleBackColor = true; + // + // generalPanel + // + this.generalPanel.Controls.Add(this.generalGrpBox); + this.generalPanel.Dock = System.Windows.Forms.DockStyle.Fill; + this.generalPanel.Location = new System.Drawing.Point(3, 3); + this.generalPanel.Name = "generalPanel"; + this.generalPanel.Size = new System.Drawing.Size(280, 361); + this.generalPanel.TabIndex = 0; + // + // generalGrpBox + // + this.generalGrpBox.Location = new System.Drawing.Point(3, 3); + this.generalGrpBox.Name = "generalGrpBox"; + this.generalGrpBox.Size = new System.Drawing.Size(283, 364); + this.generalGrpBox.TabIndex = 0; + this.generalGrpBox.TabStop = false; + this.generalGrpBox.Text = "General"; + // + // tabPage2 + // + this.tabPage2.Controls.Add(this.pathsPanel); + this.tabPage2.Location = new System.Drawing.Point(4, 22); + this.tabPage2.Name = "tabPage2"; + this.tabPage2.Padding = new System.Windows.Forms.Padding(3); + this.tabPage2.Size = new System.Drawing.Size(286, 367); + this.tabPage2.TabIndex = 1; + this.tabPage2.Text = "Paths"; + this.tabPage2.UseVisualStyleBackColor = true; + // + // pathsPanel + // + this.pathsPanel.Controls.Add(this.pathsGrpBox); + this.pathsPanel.Dock = System.Windows.Forms.DockStyle.Fill; + this.pathsPanel.Location = new System.Drawing.Point(3, 3); + this.pathsPanel.Name = "pathsPanel"; + this.pathsPanel.Size = new System.Drawing.Size(280, 361); + this.pathsPanel.TabIndex = 0; + // + // pathsGrpBox + // + this.pathsGrpBox.Location = new System.Drawing.Point(3, 3); + this.pathsGrpBox.Name = "pathsGrpBox"; + this.pathsGrpBox.Size = new System.Drawing.Size(283, 364); + this.pathsGrpBox.TabIndex = 0; + this.pathsGrpBox.TabStop = false; + this.pathsGrpBox.Text = "Paths"; + // + // tabPage3 + // + this.tabPage3.Controls.Add(this.drivesPanel); + this.tabPage3.Location = new System.Drawing.Point(4, 22); + this.tabPage3.Name = "tabPage3"; + this.tabPage3.Padding = new System.Windows.Forms.Padding(3); + this.tabPage3.Size = new System.Drawing.Size(286, 367); + this.tabPage3.TabIndex = 2; + this.tabPage3.Text = "Drives"; + this.tabPage3.UseVisualStyleBackColor = true; + // + // drivesPanel + // + this.drivesPanel.Controls.Add(this.drivesGrpBox); + this.drivesPanel.Dock = System.Windows.Forms.DockStyle.Fill; + this.drivesPanel.Location = new System.Drawing.Point(3, 3); + this.drivesPanel.Name = "drivesPanel"; + this.drivesPanel.Size = new System.Drawing.Size(280, 361); + this.drivesPanel.TabIndex = 0; + // + // drivesGrpBox + // + this.drivesGrpBox.Location = new System.Drawing.Point(3, 3); + this.drivesGrpBox.Name = "drivesGrpBox"; + this.drivesGrpBox.Size = new System.Drawing.Size(283, 364); + this.drivesGrpBox.TabIndex = 0; + this.drivesGrpBox.TabStop = false; + this.drivesGrpBox.Text = "Drives"; + // + // tabPage4 + // + this.tabPage4.Controls.Add(this.networkPanel); + this.tabPage4.Location = new System.Drawing.Point(4, 22); + this.tabPage4.Name = "tabPage4"; + this.tabPage4.Padding = new System.Windows.Forms.Padding(3); + this.tabPage4.Size = new System.Drawing.Size(286, 367); + this.tabPage4.TabIndex = 3; + this.tabPage4.Text = "Network"; + this.tabPage4.UseVisualStyleBackColor = true; + // + // networkPanel + // + this.networkPanel.Controls.Add(this.networkGrpBox); + this.networkPanel.Dock = System.Windows.Forms.DockStyle.Fill; + this.networkPanel.Location = new System.Drawing.Point(3, 3); + this.networkPanel.Name = "networkPanel"; + this.networkPanel.Size = new System.Drawing.Size(280, 361); + this.networkPanel.TabIndex = 0; + // + // networkGrpBox + // + this.networkGrpBox.Location = new System.Drawing.Point(3, 3); + this.networkGrpBox.Name = "networkGrpBox"; + this.networkGrpBox.Size = new System.Drawing.Size(283, 364); + this.networkGrpBox.TabIndex = 0; + this.networkGrpBox.TabStop = false; + this.networkGrpBox.Text = "Network"; + // + // tabPage5 + // + this.tabPage5.Controls.Add(this.ioPanel); + this.tabPage5.Location = new System.Drawing.Point(4, 22); + this.tabPage5.Name = "tabPage5"; + this.tabPage5.Padding = new System.Windows.Forms.Padding(3); + this.tabPage5.Size = new System.Drawing.Size(286, 367); + this.tabPage5.TabIndex = 4; + this.tabPage5.Text = "I/O"; + this.tabPage5.UseVisualStyleBackColor = true; + // + // ioPanel + // + this.ioPanel.Controls.Add(this.ioGrpBox); + this.ioPanel.Dock = System.Windows.Forms.DockStyle.Fill; + this.ioPanel.Location = new System.Drawing.Point(3, 3); + this.ioPanel.Name = "ioPanel"; + this.ioPanel.Size = new System.Drawing.Size(280, 361); + this.ioPanel.TabIndex = 0; + // + // ioGrpBox + // + this.ioGrpBox.Location = new System.Drawing.Point(3, 3); + this.ioGrpBox.Name = "ioGrpBox"; + this.ioGrpBox.Size = new System.Drawing.Size(283, 364); + this.ioGrpBox.TabIndex = 0; + this.ioGrpBox.TabStop = false; + this.ioGrpBox.Text = "I/O"; + // + // tabPage6 + // + this.tabPage6.Controls.Add(this.mountPanel); + this.tabPage6.Location = new System.Drawing.Point(4, 22); + this.tabPage6.Name = "tabPage6"; + this.tabPage6.Padding = new System.Windows.Forms.Padding(3); + this.tabPage6.Size = new System.Drawing.Size(286, 367); + this.tabPage6.TabIndex = 5; + this.tabPage6.Text = "Mount"; + this.tabPage6.UseVisualStyleBackColor = true; + // + // mountPanel + // + this.mountPanel.Controls.Add(this.mountGrpBox); + this.mountPanel.Dock = System.Windows.Forms.DockStyle.Fill; + this.mountPanel.Location = new System.Drawing.Point(3, 3); + this.mountPanel.Name = "mountPanel"; + this.mountPanel.Size = new System.Drawing.Size(280, 361); + this.mountPanel.TabIndex = 0; + // + // mountGrpBox + // + this.mountGrpBox.Location = new System.Drawing.Point(3, 3); + this.mountGrpBox.Name = "mountGrpBox"; + this.mountGrpBox.Size = new System.Drawing.Size(283, 364); + this.mountGrpBox.TabIndex = 0; + this.mountGrpBox.TabStop = false; + this.mountGrpBox.Text = "Mount"; + // + // tabPage7 + // + this.tabPage7.Controls.Add(this.debugPanel); + this.tabPage7.Location = new System.Drawing.Point(4, 22); + this.tabPage7.Name = "tabPage7"; + this.tabPage7.Padding = new System.Windows.Forms.Padding(3); + this.tabPage7.Size = new System.Drawing.Size(286, 367); + this.tabPage7.TabIndex = 6; + this.tabPage7.Text = "Debug"; + this.tabPage7.UseVisualStyleBackColor = true; + // + // debugPanel + // + this.debugPanel.Controls.Add(this.debugGrpBox); + this.debugPanel.Dock = System.Windows.Forms.DockStyle.Fill; + this.debugPanel.Location = new System.Drawing.Point(3, 3); + this.debugPanel.Name = "debugPanel"; + this.debugPanel.Size = new System.Drawing.Size(280, 361); + this.debugPanel.TabIndex = 0; + // + // debugGrpBox + // + this.debugGrpBox.Location = new System.Drawing.Point(3, 3); + this.debugGrpBox.Name = "debugGrpBox"; + this.debugGrpBox.Size = new System.Drawing.Size(283, 364); + this.debugGrpBox.TabIndex = 0; + this.debugGrpBox.TabStop = false; + this.debugGrpBox.Text = "Debug"; + // + // settingsOKBtn + // + this.settingsOKBtn.Location = new System.Drawing.Point(59, 400); + this.settingsOKBtn.Name = "settingsOKBtn"; + this.settingsOKBtn.Size = new System.Drawing.Size(75, 23); + this.settingsOKBtn.TabIndex = 3; + this.settingsOKBtn.Text = "OK"; + this.settingsOKBtn.UseVisualStyleBackColor = true; + // + // settingsCancelBtn + // + this.settingsCancelBtn.Location = new System.Drawing.Point(140, 400); + this.settingsCancelBtn.Name = "settingsCancelBtn"; + this.settingsCancelBtn.Size = new System.Drawing.Size(75, 23); + this.settingsCancelBtn.TabIndex = 4; + this.settingsCancelBtn.Text = "Cancel"; + this.settingsCancelBtn.UseVisualStyleBackColor = true; + // + // settingsApplyBtn + // + this.settingsApplyBtn.Location = new System.Drawing.Point(221, 400); + this.settingsApplyBtn.Name = "settingsApplyBtn"; + this.settingsApplyBtn.Size = new System.Drawing.Size(75, 23); + this.settingsApplyBtn.TabIndex = 5; + this.settingsApplyBtn.Text = "Apply"; + this.settingsApplyBtn.UseVisualStyleBackColor = true; + // + // settingsHelpBtn + // + this.settingsHelpBtn.Location = new System.Drawing.Point(302, 400); + this.settingsHelpBtn.Name = "settingsHelpBtn"; + this.settingsHelpBtn.Size = new System.Drawing.Size(75, 23); + this.settingsHelpBtn.TabIndex = 6; + this.settingsHelpBtn.Text = "Help"; + this.settingsHelpBtn.UseVisualStyleBackColor = true; + // + // settingsForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(443, 391); - this.Controls.Add(this.listboxSelection); - this.Name = "SettingsForm"; + this.ClientSize = new System.Drawing.Size(389, 435); + this.Controls.Add(this.settingsHelpBtn); + this.Controls.Add(this.settingsApplyBtn); + this.Controls.Add(this.settingsCancelBtn); + this.Controls.Add(this.settingsOKBtn); + this.Controls.Add(this.baseContainerPanel); + this.Controls.Add(this.selectionLstBox); + this.Name = "settingsForm"; this.Text = "SettingsForm"; this.Load += new System.EventHandler(this.SettingsForm_Load); + this.baseContainerPanel.ResumeLayout(false); + this.tempDesignSheetTab.ResumeLayout(false); + this.tabPage1.ResumeLayout(false); + this.generalPanel.ResumeLayout(false); + this.tabPage2.ResumeLayout(false); + this.pathsPanel.ResumeLayout(false); + this.tabPage3.ResumeLayout(false); + this.drivesPanel.ResumeLayout(false); + this.tabPage4.ResumeLayout(false); + this.networkPanel.ResumeLayout(false); + this.tabPage5.ResumeLayout(false); + this.ioPanel.ResumeLayout(false); + this.tabPage6.ResumeLayout(false); + this.mountPanel.ResumeLayout(false); + this.tabPage7.ResumeLayout(false); + this.debugPanel.ResumeLayout(false); this.ResumeLayout(false); } #endregion - private System.Windows.Forms.ListBox listboxSelection; + private System.Windows.Forms.ListBox selectionLstBox; + private System.Windows.Forms.Panel baseContainerPanel; + private System.Windows.Forms.Button settingsOKBtn; + private System.Windows.Forms.Button settingsCancelBtn; + private System.Windows.Forms.Button settingsApplyBtn; + private System.Windows.Forms.Button settingsHelpBtn; + private System.Windows.Forms.TabControl tempDesignSheetTab; + private System.Windows.Forms.TabPage tabPage1; + private System.Windows.Forms.Panel generalPanel; + private System.Windows.Forms.GroupBox generalGrpBox; + private System.Windows.Forms.TabPage tabPage2; + private System.Windows.Forms.Panel pathsPanel; + private System.Windows.Forms.GroupBox pathsGrpBox; + private System.Windows.Forms.TabPage tabPage3; + private System.Windows.Forms.Panel drivesPanel; + private System.Windows.Forms.GroupBox drivesGrpBox; + private System.Windows.Forms.TabPage tabPage4; + private System.Windows.Forms.Panel networkPanel; + private System.Windows.Forms.TabPage tabPage5; + private System.Windows.Forms.Panel ioPanel; + private System.Windows.Forms.TabPage tabPage6; + private System.Windows.Forms.Panel mountPanel; + private System.Windows.Forms.TabPage tabPage7; + private System.Windows.Forms.Panel debugPanel; + private System.Windows.Forms.GroupBox networkGrpBox; + private System.Windows.Forms.GroupBox ioGrpBox; + private System.Windows.Forms.GroupBox mountGrpBox; + private System.Windows.Forms.GroupBox debugGrpBox; } } 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 Thu May 17 18:44:52 2007 @@ -10,6 +10,9 @@ { public partial class SettingsForm : Form { + private Panel[] panels; + private int PrevSel = 0; + public SettingsForm() { InitializeComponent(); @@ -17,18 +20,31 @@ private void SettingsForm_Load(object sender, EventArgs e) { - listboxSelection.ItemHeight = listboxSelection.Height / listboxSelection.Items.Count; + selectionLstBox.ItemHeight = selectionLstBox.Height / selectionLstBox.Items.Count; + selectionLstBox.SelectedItem = 0; + selectionLstBox.SelectedValue = 0; + + panels = new Panel[] { generalPanel, pathsPanel, drivesPanel, networkPanel, ioPanel, mountPanel, debugPanel }; + + foreach (Panel pan in panels) + { + pan.Parent = tempDesignSheetTab.Parent; + pan.Visible = false; + } + + tempDesignSheetTab.Visible = false; + panels[0].Visible = true; } private void listboxSelection_DrawItem(object sender, DrawItemEventArgs e) { if ((e.State & DrawItemState.Selected) == DrawItemState.Selected) { - e.Graphics.FillRectangle(Brushes.LightBlue, e.Bounds); + e.Graphics.FillRectangle(Brushes.Silver, e.Bounds); } else { - e.Graphics.FillRectangle(Brushes.LightYellow, e.Bounds); + e.Graphics.FillRectangle(Brushes.White, e.Bounds); } StringFormat strfmt = new StringFormat(); @@ -36,7 +52,7 @@ strfmt.Alignment = StringAlignment.Center; strfmt.LineAlignment = StringAlignment.Center; - e.Graphics.DrawString(listboxSelection.Items[e.Index].ToString(), + e.Graphics.DrawString(selectionLstBox.Items[e.Index].ToString(), this.Font, Brushes.Black, e.Bounds.X + e.Bounds.Width / 2, @@ -45,5 +61,14 @@ e.DrawFocusRectangle(); } + + private void listboxSelection_SelectedIndexChanged(object sender, EventArgs e) + { + ListBox listbox = (ListBox)sender; + + panels[PrevSel].Visible = false; + PrevSel = listbox.SelectedIndex; + panels[(int)listbox.SelectedIndex].Visible = true; + } } }

1 0

[greatlrd] 26820: optimizing atan and log10, do not use frame pointer, use the stack pointer direcly
by greatlrd＠svn.reactos.org 17 May '07

17 May '07

Author: greatlrd Date: Thu May 17 14:48:00 2007 New Revision: 26820 URL: http://svn.reactos.org/svn/reactos?rev=26820&view=rev Log: optimizing atan and log10, do not use frame pointer, use the stack pointer direcly Modified: trunk/reactos/lib/sdk/crt/math/i386/atan_asm.s trunk/reactos/lib/sdk/crt/math/i386/log10_asm.s Modified: trunk/reactos/lib/sdk/crt/math/i386/atan_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/atan… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/i386/atan_asm.s (original) +++ trunk/reactos/lib/sdk/crt/math/i386/atan_asm.s Thu May 17 14:48:00 2007 @@ -14,9 +14,6 @@ /* FUNCTIONS ***************************************************************/ _atan: - push ebp - mov ebp,esp - fld qword ptr [ebp+8] - fpatan - pop ebp + fld qword ptr [esp+4] + fpatan ret Modified: trunk/reactos/lib/sdk/crt/math/i386/log10_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/log1… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/i386/log10_asm.s (original) +++ trunk/reactos/lib/sdk/crt/math/i386/log10_asm.s Thu May 17 14:48:00 2007 @@ -15,11 +15,8 @@ /* FUNCTIONS ***************************************************************/ _log10: - push ebp - mov ebp,esp - fld qword ptr [ebp+8] - fldlg2 - fyl2x - pop ebp + fld qword ptr [esp+4] + fldlg2 + fyl2x ret

1 0

[gedmurphy] 26819: add a blank settings form to eventually control individual images
by gedmurphy＠svn.reactos.org 17 May '07

17 May '07

Author: gedmurphy Date: Thu May 17 14:06:13 2007 New Revision: 26819 URL: http://svn.reactos.org/svn/reactos?rev=26819&view=rev Log: add a blank settings form to eventually control individual images Added: trunk/tools/RosTE/GUI/SettingsForm.Designer.cs trunk/tools/RosTE/GUI/SettingsForm.cs trunk/tools/RosTE/GUI/SettingsForm.resx Modified: trunk/tools/RosTE/GUI/MainForm.Designer.cs trunk/tools/RosTE/GUI/MainForm.cs trunk/tools/RosTE/GUI/MainForm.resx trunk/tools/RosTE/GUI/RosTEGUI.csproj Modified: trunk/tools/RosTE/GUI/MainForm.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/MainForm.Designer.… ============================================================================== --- trunk/tools/RosTE/GUI/MainForm.Designer.cs (original) +++ trunk/tools/RosTE/GUI/MainForm.Designer.cs Thu May 17 14:06:13 2007 @@ -83,6 +83,7 @@ this.ImageListView.TabIndex = 9; this.ImageListView.UseCompatibleStateImageBehavior = false; this.ImageListView.View = System.Windows.Forms.View.Details; + this.ImageListView.DoubleClick += new System.EventHandler(this.ImageListView_DoubleClick); // // columnName // @@ -195,6 +196,7 @@ this.toolbarExit.Name = "toolbarExit"; this.toolbarExit.Size = new System.Drawing.Size(23, 22); this.toolbarExit.ToolTipText = "Exits application"; + this.toolbarExit.Click += new System.EventHandler(this.toolbarExit_Click); // // mainToolbar // @@ -286,18 +288,18 @@ // mainmenuHelpContent // this.mainmenuHelpContent.Name = "mainmenuHelpContent"; - this.mainmenuHelpContent.Size = new System.Drawing.Size(152, 22); + this.mainmenuHelpContent.Size = new System.Drawing.Size(124, 22); this.mainmenuHelpContent.Text = "Content"; // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(149, 6); + this.toolStripSeparator1.Size = new System.Drawing.Size(121, 6); // // MainMenuHelpAbout // this.MainMenuHelpAbout.Name = "MainMenuHelpAbout"; - this.MainMenuHelpAbout.Size = new System.Drawing.Size(152, 22); + this.MainMenuHelpAbout.Size = new System.Drawing.Size(124, 22); this.MainMenuHelpAbout.Text = "About"; this.MainMenuHelpAbout.Click += new System.EventHandler(this.MainMenuHelpAbout_Click); // Modified: trunk/tools/RosTE/GUI/MainForm.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/MainForm.cs?rev=26… ============================================================================== --- trunk/tools/RosTE/GUI/MainForm.cs (original) +++ trunk/tools/RosTE/GUI/MainForm.cs Thu May 17 14:06:13 2007 @@ -30,8 +30,20 @@ private void MainMenuHelpAbout_Click(object sender, EventArgs e) { AboutForm Dlg = new AboutForm(); - Dlg.StartPosition = FormStartPosition.CenterParent; + Dlg.StartPosition = FormStartPosition.CenterScreen; Dlg.Show(); + } + + private void ImageListView_DoubleClick(object sender, EventArgs e) + { + SettingsForm SetFrm = new SettingsForm(); + SetFrm.StartPosition = FormStartPosition.CenterScreen; + SetFrm.Show(); + } + + private void toolbarExit_Click(object sender, EventArgs e) + { + Close(); } } } Modified: trunk/tools/RosTE/GUI/MainForm.resx URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/MainForm.resx?rev=… ============================================================================== --- trunk/tools/RosTE/GUI/MainForm.resx (original) +++ trunk/tools/RosTE/GUI/MainForm.resx Thu May 17 14:06:13 2007 @@ -190,12 +190,12 @@ <data name="toolbarImageAdd.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAP9JREFUOE9jYKAV - 8PDwYE9LS2Otr69nIscOxtDw4P8+fl5/gfQ/EDs+Pp6DJIPCIrz+3L5z6/+u3Tv/h0WE/Pbx8eEiyQCQ - 7Xfu3v6/e8+u/77+Pr9CQ0N5CBoA8q+9vT0LUDEbyOkwAyKiwn5GR0fz4TUA5E8o/geyPSDI7+/de3fA + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAP5JREFUOE9jYKAV + 8PDwYE9LS2Otr69nIscOxtDw4P9ePh5/gfQ/EDs+Pp6DJIPCIjz+3L5z6/+u3Tv/h0WE/Pbx8eEiyQCQ + 7Xfu3v6/e8+u/z6+Pr9CQ0N5CBoA8q+9vT0LUDEbyOkwAyKiwn5GR0fz4TUA5E8o/gey3S/A5+/de3fA LoiMDv+DJA9Wh2EYSPDO3VtAfPs/SCOIBuEDB/ej4IOHDuA2ABRoR44e/n/4yCG8GKcL0J155uzp/yDs - F+ADik6YF7G7AN1PIA1Xrl4G4/BI7z8kpwOQAddvXANjsg24fOXSfxAmywAfP59f4ZGhv0EYxAblDYIJ - aUAUAACfo+AcMbeNIAAAAABJRU5ErkJggg== + 4+cFik6YF7G7AN1PIA1Xrl4G4/BIzz8kpwOQAddvXANjsg24fOXSfxAmywBgyvsVHhn6G4RBbFDeIJiQ + BkQBADni3+9RAMaZAAAAAElFTkSuQmCC </value> </data> <data name="toolbarImageDel.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> @@ -209,20 +209,20 @@ <data name="toolbarHelpContents.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAuJJREFUOE99U21I - U2EUXllBP+qPbfVPkoyixEwRJpaouDKX9EFg/hmoZErgj5kLgq75FeTS1H05hIbzAzSC1FLCssDJjBBC - LCiQbOamMne/5t29u3ennWtKLujCw33ve8/zvOc857y7FDGP+VpRjpB6pljaf+BiRCEewd+7FXt8cRwz - vvfLV+edgaGpWI78TRDEPvt5tXvg5Anp8+SkxLIMCIIAPM8DSQZg5s241H88ScIYjN0hMjg4GGdPSfG+ - M9wVBa8XuBk3UBQJgYBfBkUFIOiago25ORivuCViLHK2ReznMt+/rKwICwsLQJWXA5mdDZT3lyxC0yRQ - vmUg8/KAMtQCNzsLz3W6MHJkAcv1olR74lGRm58HSqcDKjcX/MXFMHxZG25oehhCDF8pCgfKyoAuLARK - rwd22gX2hATRdlV7VtHaVGd2DfRH2FejQGZlwXpJCfSolBFrQb6FaCcOIuzRdc9hVSRQVSVnwoy9hg8v - hiRj/X2roq3N+MPvX4satQ60zwsjWq1gy8t+Guu0RZPz5O0FjciurcixvmhZyFXU1ROhYJCVzcI3poyn - xgrgHv7juI0/xpKAXFkAW4at4rjgfwUam+tDPB+SY9FgWQDTWF1dibpNA8fQMHK7grcV5LfEZmDT5LaO - 6fUhPpoBTVOwvLy0WQIa4errldjubqArK4GcmIDexETJVqAxb5lovaQx9SUdk5jv34BuagTG1AmTVouE - DVBgK5xKZYQ1GIBUq4ElCKBcLhi+ZxA6TM0hxChBCMGfixB0OIDMyAC6tBR64uMjOAJypg51xpQ7PR2C - NTVAZmYCU1sLmKoohqMQISzwwHS0y2QmOg/TycmAnO0ycSyfnT615k5LA6a6Gpgum1wnTuEmKGDMJvlk - JGPsjlHeukwOtfqTU6WKfDR3iktLHtlthMfjgZnOdtGpPBTBmH8u09+Om27eyGpreNBlNLYsPjY+4hG4 - xj286rHd+Q2z5jCy9K4XCQAAAABJRU5ErkJggg== + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAuFJREFUOE99U21I + U2EUXllBP+qPbfVPkoyixEwRJpaoOTKX9EFg/hmkZUrgj5kLgq75QZDLpe7LITRJEyaU2IcS1oKczQj7 + IRYUSDZzU5m7X/Pu3t270841JRd04eG+973ned5znnPeLYqEx3KhrEDIPFYu7dx1OqYQ9+HvrYptgSSO + Gd3+5evjGwOD44kc+ZsgiB2Ok2rvwOFD0me3W2JZBgRBAJ7ngSRD8OH1qPTkYJqEMRi7ScTlciU5MjL8 + bw03RcHvB27SCxRFQigUlEFRIQh7xmF1ehpGq6+JGIucDRHHidx3z6qvRoXZWaCqqoDMzwfK/0sWoWkS + qMACkEVFQBkagJuaApdOF0WOLGC9WJZpT90vcjMzQOl0QBUWQrC8HIbOaqN3m4kIYuhcWTRUWQl0aSlQ + ej2wEx6wp6SI9vPa44r21kbL+/6+GPvyBZB5ebBSUQFOlTJmKym2Eh3EboQjvnbuVcVCtbVyJszIK3A/ + HZSMTbdtCpPJ+CMYXI4btQJ0wA/DWq1gL8p/mOi0VVPw4E3xKZFdXpRjA/GykKsgGolIOMzKZuEbU8ZT + EwVwD/9x3OofY0lAriyALcNWcVz4vwJNLY0Rno/IsWiwLIBpLC0txt2mgWNoeH69mreXFLclZmDXFLaP + 6PURPp4BTVOwsDC/VgIaETdRYnt6gK6pAXJsDPpSUyV7icaybqLtjMbcn3ZAYr5/A7q1BRhzF7htVgkb + oMBW9CqVMdZgAFKtBpYggPJ4YPiWQeg0t0QQwwQhhH/OQdjpBDInB+grV8CZnBzDEZAzdapzxr3Z2RCu + rwcyNxeYhgbAVEUxGocIUYEHprNDJjPxeZhITwfkbJSJY/no6JFlb1YWMHV1wHTb5TpxCtdAAWMxyycj + GWM3jfL6ZXKq1Z96VarYx64OcX7eJ7uN8Pl8MNlhEnuVe2IY889l+ttx8+VLeabmO91GY9vcfeM9HoFr + 3MOrntid38hMMEXhM6cCAAAAAElFTkSuQmCC </value> </data> <data name="toolbarExit.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> @@ -244,15 +244,15 @@ <value> iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAhRJREFUOE+lU0tr - E1EYvVFxpXtXQn6AImKjoIhokP4F22K6UHTvUhcutGhBqyDaiEKgLkrpAxUSLUjSphjbNGmoycwkM5lH - MonGjQuplFo5zrmQ0Bm768CBO/c758z3mpAIPPkhcXo/xLAIiQvbEGGGD4SEJSAyf0Mi0fdGLAc1vffi - oHixfu0g2g/C+JU4ia3pcxI8844xcnY1KA6IlH3niCc4i83nYfy+dwgbt/dJ8Mw7xsgh12dCVwb+TEY8 - 8mGoY5eRSowg+X4G72YnMTd+F6XRqIyRI026mbBmpkZ3EnLjN1BYy2Njog/u/aMSqlZBOvMJi8+uSw65 - 1FAr6MT6mKLyOIqVfA7HT0WwPXde4mf8GDo/vsFpmPjwMYnSw0uSS43MojgkVDaJdX6eGYPlGHBbTs+E - Bt87LbTaDShaGfMTI5JLDbViZVBsstNsVjadhO3U4bgW3LaDgdiwhOuJm64N09GRXUhJLjXU+gyWFlOo - 2zWZhdM0ceVqTOJE5IxnFINp61j9kvYb7Cwh//YpanXVM6lKMo2shiG/TGPD1KDMx/0l7Gyi8STqTWAZ - Vb0C3SMbVtUTERpqpopqvYJOvN/fxOAYC69uYimXwdr6KrRaWZpphgf9K5qzt/4fIzcquEjKo4vITo2i - VFiAUs6hnnmNzsv+3Repu5J7WuWeyV5+pq4Je8KSOB3OmeCZd3J1A88/Nus6r/DgkxoAAAAASUVORK5C + E1EYvVHoSvddCfkBioiNgiKiQfoXbIvpQtG9S1240KIFrYJoIwqBuihiW1RItCBJm2Ja06ShJjOTzCMz + ySQaNy6kUlrlOOdCQmfaXQcO3LnfOWe+14RE4MmPiFMHIUZFSJzfgggz3BcSdQGR+RcSiYHXYiWo6b0X + h8Xz9at9aN8P43fiBLbenpXgmXeMkbOnQXFIpOzb/Z7gDDafhfHn7iFs3DogwTPvGCOHXJ8JXRnYno54 + 5MNQJy4hlRhD8sMM3s9OY27yDkrjURkjR5p0M2HNTI3uJOQmr6OwlsfG1ADce0ckVK2CdOYzFp9ekxxy + qaFW0In1MUXlURRf8zkcOxnB37lzEr/iR9H5+R1Ow8LHT0mUHlyUXGpkFsURobJJrPPLzATqjgG35fRM + aPCj00Kr3YCilTE/NSa51FArlofFJjvNZmXTSdiOCcetw207GIqNSrieuOnasBwd2YWU5FJDrc9gaTEF + 067JLJymhctXYhLHI6c9oxgsW8fqctpvsLOE/LsnqJmqZ1KVZBrVG4b8Mo0NS4MyH/eXsLOJxuOoN4EV + VPUKdI9s1KueiNBQs1RUzQo68UF/E4NjLLy8gaVcBmvrq9BqZWmmGR70b2jO3tw9Rm5UcJGUhxeQfTOO + UmEBSjkHM/MKnReDey9SdyX3tco9k/38TF0T9oQlcTqcM8Ez7+TqBp7/Jgc6o8D7AAMAAAAASUVORK5C YII= </value> </data> 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 Thu May 17 14:06:13 2007 @@ -129,6 +129,12 @@ <DesignTime>True</DesignTime> <DependentUpon>Resources.resx</DependentUpon> </Compile> + <Compile Include="SettingsForm.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="SettingsForm.Designer.cs"> + <DependentUpon>SettingsForm.cs</DependentUpon> + </Compile> <EmbeddedResource Include="MainForm.resx"> <DependentUpon>MainForm.cs</DependentUpon> <SubType>Designer</SubType> @@ -151,6 +157,10 @@ <SubType>Designer</SubType> <DependentUpon>AboutForm.cs</DependentUpon> </EmbeddedResource> + <EmbeddedResource Include="SettingsForm.resx"> + <SubType>Designer</SubType> + <DependentUpon>SettingsForm.cs</DependentUpon> + </EmbeddedResource> <Content Include="ros.ico" /> </ItemGroup> <ItemGroup> Added: trunk/tools/RosTE/GUI/SettingsForm.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/SettingsForm.Desig… ============================================================================== --- trunk/tools/RosTE/GUI/SettingsForm.Designer.cs (added) +++ trunk/tools/RosTE/GUI/SettingsForm.Designer.cs Thu May 17 14:06:13 2007 @@ -1,0 +1,73 @@ +namespace RosTEGUI +{ + partial class SettingsForm + { + /// <summary> + /// Required designer variable. + /// </summary> + private System.ComponentModel.IContainer components = null; + + /// <summary> + /// Clean up any resources being used. + /// </summary> + /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param> + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// <summary> + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// </summary> + private void InitializeComponent() + { + this.listboxSelection = new System.Windows.Forms.ListBox(); + this.SuspendLayout(); + // + // listboxSelection + // + this.listboxSelection.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.listboxSelection.Cursor = System.Windows.Forms.Cursors.Hand; + this.listboxSelection.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; + this.listboxSelection.FormattingEnabled = true; + this.listboxSelection.ItemHeight = 45; + this.listboxSelection.Items.AddRange(new object[] { + "test1", + "test2", + "test3", + "test4", + "test5", + "test6", + "test7", + "test8"}); + this.listboxSelection.Location = new System.Drawing.Point(12, 12); + this.listboxSelection.Name = "listboxSelection"; + this.listboxSelection.Size = new System.Drawing.Size(74, 362); + this.listboxSelection.TabIndex = 0; + this.listboxSelection.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.listboxSelection_DrawItem); + // + // SettingsForm + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(443, 391); + this.Controls.Add(this.listboxSelection); + this.Name = "SettingsForm"; + this.Text = "SettingsForm"; + this.Load += new System.EventHandler(this.SettingsForm_Load); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.ListBox listboxSelection; + } +} Added: 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 (added) +++ trunk/tools/RosTE/GUI/SettingsForm.cs Thu May 17 14:06:13 2007 @@ -1,0 +1,49 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Text; +using System.Windows.Forms; + +namespace RosTEGUI +{ + public partial class SettingsForm : Form + { + public SettingsForm() + { + InitializeComponent(); + } + + private void SettingsForm_Load(object sender, EventArgs e) + { + listboxSelection.ItemHeight = listboxSelection.Height / listboxSelection.Items.Count; + } + + private void listboxSelection_DrawItem(object sender, DrawItemEventArgs e) + { + if ((e.State & DrawItemState.Selected) == DrawItemState.Selected) + { + e.Graphics.FillRectangle(Brushes.LightBlue, e.Bounds); + } + else + { + e.Graphics.FillRectangle(Brushes.LightYellow, e.Bounds); + } + + StringFormat strfmt = new StringFormat(); + + strfmt.Alignment = StringAlignment.Center; + strfmt.LineAlignment = StringAlignment.Center; + + e.Graphics.DrawString(listboxSelection.Items[e.Index].ToString(), + this.Font, + Brushes.Black, + e.Bounds.X + e.Bounds.Width / 2, + e.Bounds.Y + e.Bounds.Height / 2, + strfmt); + + e.DrawFocusRectangle(); + } + } +} Added: trunk/tools/RosTE/GUI/SettingsForm.resx URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/SettingsForm.resx?… ============================================================================== --- trunk/tools/RosTE/GUI/SettingsForm.resx (added) +++ trunk/tools/RosTE/GUI/SettingsForm.resx Thu May 17 14:06:13 2007 @@ -1,0 +1,120 @@ +<?xml version="1.0" encoding="utf-8"?> +<root> +  + <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> + <xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> + <xsd:element name="root" msdata:IsDataSet="true"> + <xsd:complexType> + <xsd:choice maxOccurs="unbounded"> + <xsd:element name="metadata"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" /> + </xsd:sequence> + <xsd:attribute name="name" use="required" type="xsd:string" /> + <xsd:attribute name="type" type="xsd:string" /> + <xsd:attribute name="mimetype" type="xsd:string" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="assembly"> + <xsd:complexType> + <xsd:attribute name="alias" type="xsd:string" /> + <xsd:attribute name="name" type="xsd:string" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="data"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> + <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> + <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="resheader"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" /> + </xsd:complexType> + </xsd:element> + </xsd:choice> + </xsd:complexType> + </xsd:element> + </xsd:schema> + <resheader name="resmimetype"> + <value>text/microsoft-resx</value> + </resheader> + <resheader name="version"> + <value>2.0</value> + </resheader> + <resheader name="reader"> + <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <resheader name="writer"> + <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> +</root>

1 0

[arty] 26818: - Fix a last bug in elf code. - Start cleaning in kernel land for our current environment. - Fix the build process just a bit (assign common addresses and loosen acceptable sections a bit).
by arty＠svn.reactos.org 17 May '07

17 May '07

Author: arty Date: Thu May 17 11:54:40 2007 New Revision: 26818 URL: http://svn.reactos.org/svn/reactos?rev=26818&view=rev Log: - Fix a last bug in elf code. - Start cleaning in kernel land for our current environment. - Fix the build process just a bit (assign common addresses and loosen acceptable sections a bit). Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c branches/powerpc/reactos/ntoskrnl/ke/freeldr.c branches/powerpc/reactos/tools/ppc-build/elfpe/compdvr.cpp branches/powerpc/reactos/tools/ppc-build/elfpe/header.cpp Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c Thu May 17 11:54:40 2007 @@ -196,6 +196,15 @@ } MmuMapPage((void *)KernelBase, info, page); + + /* Map module name strings */ + for( i = 0; i < LoaderBlock.ModsCount; i++ ) + { + page = ROUND_DOWN(((ULONG)reactos_modules[i].String), (1<<PFN_SHIFT)); + info[i].flags = MMU_ALL_RW; + info[i].phys = page; + MmuMapPage((void *)page, info, 1); + } /* Tell them we're booting */ DrawNumber(LocalBootInfo,(ULONG)&LoaderBlock,10,100); @@ -513,10 +522,20 @@ memcpy(&symbol, SymbolSection + (ELF32_R_SYM(reloc.r_info) * sizeof(symbol)), sizeof(symbol)); /* Compute addends */ - S = symbol.st_value + ELF_SECTION(symbol.st_shndx)->sh_addr + KernelAddr; + S = symbol.st_value + ELF_SECTION(symbol.st_shndx)->sh_addr + KernelAddr + reloc.r_addend; A = reloc.r_addend; P = reloc.r_offset + ELF_SECTION(targetSection)->sh_addr; - + +#if 0 + printf("Symbol %d -> %d(%x:%x) -> %x@%x\n", + ELF32_R_SYM(reloc.r_info), + symbol.st_shndx, + ELF_SECTION(symbol.st_shndx)->sh_addr, + symbol.st_value, + S, + P); +#endif + Target32 = (ULONG*)(((PCHAR)MemLoadAddr) + P); Target16 = (USHORT *)Target32; x = *Target32; Modified: branches/powerpc/reactos/ntoskrnl/ke/freeldr.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/ke/fre… ============================================================================== --- branches/powerpc/reactos/ntoskrnl/ke/freeldr.c (original) +++ branches/powerpc/reactos/ntoskrnl/ke/freeldr.c Thu May 17 11:54:40 2007 @@ -323,21 +323,6 @@ PKTSS Tss; PKGDTENTRY TssEntry; #endif -#ifdef _M_PPC - { - __asm__("ori 0,0,0"); - char *nk = "ntoskrnl is here"; - boot_infos_t *XBootInfo = (boot_infos_t *)LoaderBlock->ArchExtra; - memcpy(&PpcEarlybootInfo, XBootInfo, sizeof(PpcEarlybootInfo)); - PpcEarlybootInfo.dispFont = BootDigits; - LoaderBlock->ArchExtra = (ULONG)&PpcEarlybootInfo; - BootInfo = (struct _boot_infos_t *)&PpcEarlybootInfo; - DrawNumber(BootInfo, 0x1234abcd, 10, 100); - DrawNumber(BootInfo, (ULONG)nk, 10 , 150); - DrawString(BootInfo, nk, 100, 150); - __asm__("ori 0,0,0"); - } -#endif #ifdef _M_IX86 /* Load the GDT and IDT */ @@ -354,9 +339,6 @@ TssEntry->HighWord.Bytes.BaseMid = (UCHAR)((ULONG_PTR)Tss >> 16); TssEntry->HighWord.Bytes.BaseHi = (UCHAR)((ULONG_PTR)Tss >> 24); #endif - - DrawNumber(BootInfo, 0xb0071f03, 190, 90); - DrawNumber(BootInfo, (ULONG)BootInfo, 190, 100); /* Copy the Loader Block Data locally since Low-Memory will be wiped */ memcpy(&KeRosLoaderBlock, LoaderBlock, sizeof(ROS_LOADER_PARAMETER_BLOCK)); @@ -424,14 +406,6 @@ } #ifdef _M_PPC - if(i == 0) { - DrawNumber(BootInfo, KeLoaderModules[i].ModStart, 10, 200); - DrawNumber(BootInfo, KeLoaderModules[i].ModEnd - KeLoaderModules[i].ModStart, 100, 200); - DrawNumber(BootInfo, KeLoaderModules[i].ModEnd, 190, 200); - DrawNumber(BootInfo, KeLoaderModules[i+1].ModStart, 10, 210); - DrawNumber(BootInfo, KeLoaderModules[i+1].ModEnd - KeLoaderModules[i+1].ModStart, 100, 210); - DrawNumber(BootInfo, KeLoaderModules[i+1].ModEnd, 190, 210); - } KeLoaderModules[i].ModStart += KSEG0_BASE - StartKernelBase; KeLoaderModules[i].ModEnd += KSEG0_BASE - StartKernelBase; #else @@ -453,30 +427,18 @@ } /* Choose last module address as the final kernel address */ - /* This is a workaround re: high and low adjust. - * The ABI we're using doesn't respect HIGHADJ pairing like compilers for NT do, so well be a bit - * lenient. This can be fixed later. - */ -#ifndef _M_PPC MmFreeLdrLastKernelAddress = - PAGE_ROUND_UP(KeLoaderModules[KeRosLoaderBlock.ModsCount - 1].ModEnd); + ROUND_UP(KeLoaderModules[KeRosLoaderBlock.ModsCount - 1].ModEnd, 0x10000); /* Select the HAL Base */ HalBase = KeLoaderModules[1].ModStart; /* Choose Driver Base */ DriverBase = MmFreeLdrLastKernelAddress; +#ifdef _M_PPC + LdrHalBase = KeLoaderModules[1].ModStart; +#else LdrHalBase = (ULONG_PTR)DriverBase; -#else - MmFreeLdrLastKernelAddress = - ROUND_UP(KeLoaderModules[KeRosLoaderBlock.ModsCount - 1].ModEnd, 0x10000); - - /* Select the HAL Base */ - HalBase = KeLoaderModules[1].ModStart; - - /* Choose Driver Base */ - DriverBase = MmFreeLdrLastKernelAddress; - LdrHalBase = KeLoaderModules[1].ModStart; #endif /* Initialize Module Management */ Modified: branches/powerpc/reactos/tools/ppc-build/elfpe/compdvr.cpp URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc-build… ============================================================================== --- branches/powerpc/reactos/tools/ppc-build/elfpe/compdvr.cpp (original) +++ branches/powerpc/reactos/tools/ppc-build/elfpe/compdvr.cpp Thu May 17 11:54:40 2007 @@ -164,6 +164,7 @@ args.insert(args.begin()+1,"-T"); args.insert(args.begin()+2,ldscript); args.insert(args.begin()+1,"-r"); + args.insert(args.begin()+1,"-dc"); for( size_t i = 0; i < args.size(); i++ ) { if( args[i] == "-o" && i < args.size()-1 ) { Modified: branches/powerpc/reactos/tools/ppc-build/elfpe/header.cpp URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc-build… ============================================================================== --- branches/powerpc/reactos/tools/ppc-build/elfpe/header.cpp (original) +++ branches/powerpc/reactos/tools/ppc-build/elfpe/header.cpp Thu May 17 11:54:40 2007 @@ -135,8 +135,7 @@ for(int i = 0; i < eof->getNumSections(); i++) { { const ElfObjectFile::Section &sect = eof->getSection(i); - if((sect.getType() == SHT_PROGBITS) && - (sect.getFlags() & SHF_ALLOC)) { + if(sect.getFlags() & SHF_ALLOC) { limit = roundup(start + sect.logicalSize(), sectionalign); #if 0 fprintf(stderr, "rva[%02d:%s] = (%x %x %d)\n",

1 0

[ion] 26817: - Implement NtDeleteKey as a simpler wrapper around CmDeleteKey. - Add cmkeydel.c to handle key deletion. Will proably move to cmkcbncb.c later. Implemented CmpMarkKeyDirty, CmpFreeKeyBody, CmpFreeKeyByCell. - Implement CmpMarkIndexDirty, CmpRemoveSubKey in cmindex.c. - Implement CmDeleteKey (which uses CmpFreeKeyByCell for all the work). - Remove CmiRemoveKeyFromList, CmiRemoveSubKey, CmiRemoveKeyFromHashTable, CmiSaveTempHive.
by ion＠svn.reactos.org 17 May '07

17 May '07

Author: ion Date: Thu May 17 04:27:14 2007 New Revision: 26817 URL: http://svn.reactos.org/svn/reactos?rev=26817&view=rev Log: - Implement NtDeleteKey as a simpler wrapper around CmDeleteKey. - Add cmkeydel.c to handle key deletion. Will proably move to cmkcbncb.c later. Implemented CmpMarkKeyDirty, CmpFreeKeyBody, CmpFreeKeyByCell. - Implement CmpMarkIndexDirty, CmpRemoveSubKey in cmindex.c. - Implement CmDeleteKey (which uses CmpFreeKeyByCell for all the work). - Remove CmiRemoveKeyFromList, CmiRemoveSubKey, CmiRemoveKeyFromHashTable, CmiSaveTempHive. Added: trunk/reactos/ntoskrnl/config/cmkeydel.c Modified: trunk/reactos/lib/cmlib/hivecell.c trunk/reactos/ntoskrnl/cm/cm.h trunk/reactos/ntoskrnl/cm/ntfunc.c trunk/reactos/ntoskrnl/cm/regfile.c trunk/reactos/ntoskrnl/cm/regobj.c trunk/reactos/ntoskrnl/config/cm.h trunk/reactos/ntoskrnl/config/cmapi.c trunk/reactos/ntoskrnl/config/cmindex.c trunk/reactos/ntoskrnl/ntoskrnl.rbuild Modified: trunk/reactos/lib/cmlib/hivecell.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivecell.c?rev=2… ============================================================================== --- trunk/reactos/lib/cmlib/hivecell.c (original) +++ trunk/reactos/lib/cmlib/hivecell.c Thu May 17 04:27:14 2007 @@ -221,7 +221,7 @@ pFreeCellOffset = FreeCellData; } - ASSERT(FALSE); + //ASSERT(FALSE); } static HCELL_INDEX CMAPI Modified: trunk/reactos/ntoskrnl/cm/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/cm.h?rev=26817… ============================================================================== --- trunk/reactos/ntoskrnl/cm/cm.h (original) +++ trunk/reactos/ntoskrnl/cm/cm.h Thu May 17 04:27:14 2007 @@ -168,9 +168,6 @@ IN PKEY_OBJECT NewKey); NTSTATUS -CmiRemoveKeyFromList(IN PKEY_OBJECT NewKey); - -NTSTATUS CmiScanKeyList(IN PKEY_OBJECT Parent, IN PUNICODE_STRING KeyName, IN ULONG Attributes, @@ -183,9 +180,6 @@ NTSTATUS CmiFlushRegistryHive(PEREGISTRY_HIVE RegistryHive); - -ULONG -CmiGetNumberOfSubKeys(PKEY_OBJECT KeyObject); ULONG CmiGetMaxNameLength(IN PHHIVE RegistryHive, IN PCM_KEY_NODE KeyCell); @@ -220,11 +214,6 @@ IN ULONG CreateOptions); NTSTATUS -CmiRemoveSubKey(IN PEREGISTRY_HIVE RegistryHive, - IN PKEY_OBJECT Parent, - IN PKEY_OBJECT SubKey); - -NTSTATUS CmiScanKeyForValue(IN PEREGISTRY_HIVE RegistryHive, IN PCM_KEY_NODE KeyCell, IN PUNICODE_STRING ValueName, @@ -280,6 +269,10 @@ IN PULONG ResultLength); NTSTATUS +NTAPI +CmDeleteKey(IN PKEY_OBJECT KeyObject); + +NTSTATUS CmiAllocateHashTableCell(IN PEREGISTRY_HIVE RegistryHive, OUT PHASH_TABLE_CELL *HashBlock, OUT HCELL_INDEX *HBOffset, @@ -295,16 +288,6 @@ HCELL_INDEX NKBOffset); NTSTATUS -CmiRemoveKeyFromHashTable(PEREGISTRY_HIVE RegistryHive, - PHASH_TABLE_CELL HashBlock, - HCELL_INDEX NKBOffset); - -NTSTATUS -CmiDestroyValueCell(PEREGISTRY_HIVE RegistryHive, - PCM_KEY_VALUE ValueCell, - HCELL_INDEX VBOffset); - -NTSTATUS CmiConnectHive(POBJECT_ATTRIBUTES KeyObjectAttributes, PEREGISTRY_HIVE RegistryHive); @@ -329,10 +312,6 @@ VOID CmiSyncHives(VOID); - -NTSTATUS -CmiSaveTempHive (PEREGISTRY_HIVE Hive, - HANDLE FileHandle); NTSTATUS NTAPI Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/ntfunc.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/cm/ntfunc.c (original) +++ trunk/reactos/ntoskrnl/cm/ntfunc.c Thu May 17 04:27:14 2007 @@ -435,115 +435,6 @@ return Status; } - -NTSTATUS STDCALL -NtDeleteKey(IN HANDLE KeyHandle) -{ - KPROCESSOR_MODE PreviousMode; - PKEY_OBJECT KeyObject; - NTSTATUS Status; - REG_DELETE_KEY_INFORMATION DeleteKeyInfo; - REG_POST_OPERATION_INFORMATION PostOperationInfo; - - PAGED_CODE(); - - DPRINT("NtDeleteKey(KeyHandle 0x%p) called\n", KeyHandle); - - PreviousMode = ExGetPreviousMode(); - - /* Verify that the handle is valid and is a registry key */ - Status = ObReferenceObjectByHandle(KeyHandle, - DELETE, - CmpKeyObjectType, - PreviousMode, - (PVOID *)&KeyObject, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT1("ObReferenceObjectByHandle() failed (Status %lx)\n", Status); - return Status; - } - - PostOperationInfo.Object = (PVOID)KeyObject; - DeleteKeyInfo.Object = (PVOID)KeyObject; - Status = CmiCallRegisteredCallbacks(RegNtPreDeleteKey, &DeleteKeyInfo); - if (!NT_SUCCESS(Status)) - { - PostOperationInfo.Status = Status; - CmiCallRegisteredCallbacks(RegNtPostDeleteKey, &PostOperationInfo); - ObDereferenceObject(KeyObject); - return Status; - } - - /* Acquire hive lock */ - KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); - - VERIFY_KEY_OBJECT(KeyObject); - - /* Check for subkeys */ - if (KeyObject->KeyCell->SubKeyCounts[HvStable] != 0 || - KeyObject->KeyCell->SubKeyCounts[HvVolatile] != 0) - { - Status = STATUS_CANNOT_DELETE; - } - else - { - PKEY_OBJECT ParentKeyObject = KeyObject->ParentKey; - - if (!NT_SUCCESS(CmiRemoveKeyFromList(KeyObject))) - { - DPRINT1("Key not found in parent list ???\n"); - } - - CmiRemoveSubKey(KeyObject->RegistryHive, - ParentKeyObject, - KeyObject); - - KeQuerySystemTime (&ParentKeyObject->KeyCell->LastWriteTime); - HvMarkCellDirty(&ParentKeyObject->RegistryHive->Hive, - ParentKeyObject->KeyCellOffset); - - if (!IsNoFileHive (KeyObject->RegistryHive) || - !IsNoFileHive (ParentKeyObject->RegistryHive)) - { - CmiSyncHives (); - } - - Status = STATUS_SUCCESS; - } - - /* Release hive lock */ - ExReleaseResourceLite(&CmpRegistryLock); - KeLeaveCriticalRegion(); - - DPRINT("PointerCount %lu\n", ObGetObjectPointerCount((PVOID)KeyObject)); - - /* Remove the keep-alive reference */ - ObDereferenceObject(KeyObject); - - if (KeyObject->RegistryHive != KeyObject->ParentKey->RegistryHive) - ObDereferenceObject(KeyObject); - - PostOperationInfo.Status = Status; - CmiCallRegisteredCallbacks(RegNtPostDeleteKey, &PostOperationInfo); - - /* Dereference the object */ - ObDereferenceObject(KeyObject); - - DPRINT("PointerCount %lu\n", ObGetObjectPointerCount((PVOID)KeyObject)); - DPRINT("HandleCount %lu\n", ObGetObjectHandleCount((PVOID)KeyObject)); - - /* - * Note: - * Hive-Synchronization will not be triggered here. This is done in - * CmpDeleteKeyObject() (in regobj.c) after all key-related structures - * have been released. - */ - - return Status; -} - NTSTATUS STDCALL NtFlushKey(IN HANDLE KeyHandle) { @@ -810,6 +701,52 @@ CmiRegistryInitialized = TRUE; return Status; +} + +NTSTATUS +NTAPI +NtDeleteKey(IN HANDLE KeyHandle) +{ + PKEY_OBJECT KeyObject; + NTSTATUS Status; + REG_DELETE_KEY_INFORMATION DeleteKeyInfo; + REG_POST_OPERATION_INFORMATION PostOperationInfo; + PAGED_CODE(); + + /* Verify that the handle is valid and is a registry key */ + Status = ObReferenceObjectByHandle(KeyHandle, + DELETE, + CmpKeyObjectType, + ExGetPreviousMode(), + (PVOID *)&KeyObject, + NULL); + if (!NT_SUCCESS(Status)) return Status; + + /* Setup the callback */ + PostOperationInfo.Object = (PVOID)KeyObject; + DeleteKeyInfo.Object = (PVOID)KeyObject; + Status = CmiCallRegisteredCallbacks(RegNtPreDeleteKey, &DeleteKeyInfo); + if (NT_SUCCESS(Status)) + { + /* Call the internal API */ + Status = CmDeleteKey(KeyObject); + + /* Remove the keep-alive reference */ + ObDereferenceObject(KeyObject); + if (KeyObject->RegistryHive != KeyObject->ParentKey->RegistryHive) + { + /* Dereference again */ + ObDereferenceObject(KeyObject); + } + + /* Do post callback */ + PostOperationInfo.Status = Status; + CmiCallRegisteredCallbacks(RegNtPostDeleteKey, &PostOperationInfo); + } + + /* Dereference the object */ + ObDereferenceObject(KeyObject); + return Status; } NTSTATUS Modified: trunk/reactos/ntoskrnl/cm/regfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/regfile.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/cm/regfile.c (original) +++ trunk/reactos/ntoskrnl/cm/regfile.c Thu May 17 04:27:14 2007 @@ -66,7 +66,6 @@ ZwClose(RegistryHive->LogHandle); } - NTSTATUS CmiFlushRegistryHive(PEREGISTRY_HIVE RegistryHive) { @@ -103,26 +102,6 @@ return Success ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL; } - -ULONG -CmiGetNumberOfSubKeys(PKEY_OBJECT KeyObject) -{ - PCM_KEY_NODE KeyCell; - ULONG SubKeyCount; - - VERIFY_KEY_OBJECT(KeyObject); - - KeyCell = KeyObject->KeyCell; - VERIFY_KEY_CELL(KeyCell); - - SubKeyCount = (KeyCell == NULL) ? 0 : - KeyCell->SubKeyCounts[HvStable] + - KeyCell->SubKeyCounts[HvVolatile]; - - return SubKeyCount; -} - - ULONG CmiGetMaxNameLength(PHHIVE Hive, PCM_KEY_NODE KeyCell) @@ -160,7 +139,6 @@ return MaxName; } - ULONG CmiGetMaxClassLength(PHHIVE Hive, PCM_KEY_NODE KeyCell) @@ -195,7 +173,6 @@ return MaxClass; } - ULONG CmiGetMaxValueNameLength(PHHIVE Hive, @@ -243,7 +220,6 @@ return MaxValueName; } - ULONG CmiGetMaxValueDataLength(PHHIVE Hive, @@ -518,109 +494,6 @@ } NTSTATUS -CmiRemoveSubKey(PEREGISTRY_HIVE RegistryHive, - PKEY_OBJECT ParentKey, - PKEY_OBJECT SubKey) -{ - PHASH_TABLE_CELL HashBlock; - PVALUE_LIST_CELL ValueList; - PCM_KEY_VALUE ValueCell; - HV_STORAGE_TYPE Storage; - ULONG i; - - DPRINT("CmiRemoveSubKey() called\n"); - - Storage = (SubKey->KeyCell->Flags & REG_KEY_VOLATILE_CELL) ? HvVolatile : HvStable; - - /* Remove all values */ - if (SubKey->KeyCell->ValueList.Count != 0) - { - /* Get pointer to the value list cell */ - ValueList = HvGetCell (&RegistryHive->Hive, SubKey->KeyCell->ValueList.List); - - /* Enumerate all values */ - for (i = 0; i < SubKey->KeyCell->ValueList.Count; i++) - { - /* Get pointer to value cell */ - ValueCell = HvGetCell(&RegistryHive->Hive, - ValueList->ValueOffset[i]); - - if (!(ValueCell->DataSize & REG_DATA_IN_OFFSET) - && ValueCell->DataSize > sizeof(HCELL_INDEX) - && ValueCell->DataOffset != HCELL_NULL) - { - /* Destroy data cell */ - HvFreeCell (&RegistryHive->Hive, ValueCell->DataOffset); - } - - /* Destroy value cell */ - HvFreeCell (&RegistryHive->Hive, ValueList->ValueOffset[i]); - } - - /* Destroy value list cell */ - HvFreeCell (&RegistryHive->Hive, SubKey->KeyCell->ValueList.List); - - SubKey->KeyCell->ValueList.Count = 0; - SubKey->KeyCell->ValueList.List = (HCELL_INDEX)-1; - - HvMarkCellDirty(&RegistryHive->Hive, SubKey->KeyCellOffset); - } - - /* Remove the key from the parent key's hash block */ - if (ParentKey->KeyCell->SubKeyLists[Storage] != HCELL_NULL) - { - DPRINT("ParentKey SubKeyLists %lx\n", ParentKey->KeyCell->SubKeyLists[Storage]); - HashBlock = HvGetCell (&ParentKey->RegistryHive->Hive, - ParentKey->KeyCell->SubKeyLists[Storage]); - ASSERT(HashBlock->Id == REG_HASH_TABLE_CELL_ID); - DPRINT("ParentKey HashBlock %p\n", HashBlock); - CmiRemoveKeyFromHashTable(ParentKey->RegistryHive, - HashBlock, - SubKey->KeyCellOffset); - HvMarkCellDirty(&ParentKey->RegistryHive->Hive, - ParentKey->KeyCell->SubKeyLists[Storage]); - } - - /* Remove the key's hash block */ - if (SubKey->KeyCell->SubKeyLists[Storage] != HCELL_NULL) - { - DPRINT("SubKey SubKeyLists %lx\n", SubKey->KeyCell->SubKeyLists[Storage]); - HvFreeCell (&RegistryHive->Hive, SubKey->KeyCell->SubKeyLists[Storage]); - SubKey->KeyCell->SubKeyLists[Storage] = HCELL_NULL; - } - - /* Decrement the number of the parent key's sub keys */ - if (ParentKey != NULL) - { - DPRINT("ParentKey %p\n", ParentKey); - ParentKey->KeyCell->SubKeyCounts[Storage]--; - - /* Remove the parent key's hash table */ - if (ParentKey->KeyCell->SubKeyCounts[Storage] == 0 && - ParentKey->KeyCell->SubKeyLists[Storage] != HCELL_NULL) - { - DPRINT("ParentKey SubKeyLists %lx\n", ParentKey->KeyCell->SubKeyLists); - HvFreeCell (&ParentKey->RegistryHive->Hive, - ParentKey->KeyCell->SubKeyLists[Storage]); - ParentKey->KeyCell->SubKeyLists[Storage] = HCELL_NULL; - } - - KeQuerySystemTime(&ParentKey->KeyCell->LastWriteTime); - HvMarkCellDirty(&ParentKey->RegistryHive->Hive, - ParentKey->KeyCellOffset); - } - - /* Destroy key cell */ - HvFreeCell (&RegistryHive->Hive, SubKey->KeyCellOffset); - SubKey->KeyCell = NULL; - SubKey->KeyCellOffset = (HCELL_INDEX)-1; - - DPRINT("CmiRemoveSubKey() done\n"); - - return STATUS_SUCCESS; -} - -NTSTATUS CmiAllocateHashTableCell (IN PEREGISTRY_HIVE RegistryHive, OUT PHASH_TABLE_CELL *HashBlock, OUT HCELL_INDEX *HBOffset, @@ -675,34 +548,4 @@ return STATUS_SUCCESS; } -NTSTATUS -CmiRemoveKeyFromHashTable(PEREGISTRY_HIVE RegistryHive, - PHASH_TABLE_CELL HashBlock, - HCELL_INDEX NKBOffset) -{ - ULONG i; - - for (i = 0; i < HashBlock->HashTableSize; i++) - { - if (HashBlock->Table[i].KeyOffset == NKBOffset) - { - RtlMoveMemory(HashBlock->Table + i, - HashBlock->Table + i + 1, - (HashBlock->HashTableSize - i - 1) * - sizeof(HashBlock->Table[0])); - return STATUS_SUCCESS; - } - } - - return STATUS_UNSUCCESSFUL; -} - -NTSTATUS -CmiSaveTempHive (PEREGISTRY_HIVE Hive, - HANDLE FileHandle) -{ - Hive->HiveHandle = FileHandle; - return HvWriteHive(&Hive->Hive) ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL; -} - /* EOF */ Modified: trunk/reactos/ntoskrnl/cm/regobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/regobj.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/cm/regobj.c (original) +++ trunk/reactos/ntoskrnl/cm/regobj.c Thu May 17 04:27:14 2007 @@ -633,20 +633,9 @@ RemoveEntryList(&KeyObject->ListEntry); RtlFreeUnicodeString(&KeyObject->Name); - if (!NT_SUCCESS(CmiRemoveKeyFromList(KeyObject))) - { - DPRINT1("Key not found in parent list ???\n"); - } - - - ASSERT((KeyObject->Flags & KO_MARKED_FOR_DELETE) == FALSE); + ASSERT((KeyObject->Flags & KO_MARKED_FOR_DELETE) == FALSE); ObDereferenceObject (ParentKeyObject); - - if (KeyObject->SubKeyCounts) - { - KEBUGCHECK(REGISTRY_ERROR); - } if (KeyObject->SizeOfSubKeys) { @@ -767,36 +756,6 @@ KernelMode); NewKey->ParentKey = ParentKey; } - - -NTSTATUS -CmiRemoveKeyFromList(PKEY_OBJECT KeyToRemove) -{ - PKEY_OBJECT ParentKey; - ULONG Index; - - ParentKey = KeyToRemove->ParentKey; - /* FIXME: If list maintained in alphabetic order, use dichotomic search */ - for (Index = 0; Index < ParentKey->SubKeyCounts; Index++) - { - if (ParentKey->SubKeys[Index] == KeyToRemove) - { - if (Index < ParentKey->SubKeyCounts-1) - RtlMoveMemory(&ParentKey->SubKeys[Index], - &ParentKey->SubKeys[Index + 1], - (ParentKey->SubKeyCounts - Index - 1) * sizeof(PKEY_OBJECT)); - ParentKey->SubKeyCounts--; - - DPRINT("Dereference parent key: 0x%x\n", ParentKey); - - ObDereferenceObject(ParentKey); - return STATUS_SUCCESS; - } - } - - return STATUS_UNSUCCESSFUL; -} - NTSTATUS CmiScanKeyList(PKEY_OBJECT Parent, Modified: trunk/reactos/ntoskrnl/config/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cm.h?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/config/cm.h (original) +++ trunk/reactos/ntoskrnl/config/cm.h Thu May 17 04:27:14 2007 @@ -693,6 +693,7 @@ #define SYSTEM_LOG_FILE L"\\SystemRoot\\System32\\Config\\SYSTEM.log" #define REG_SYSTEM_KEY_NAME L"\\Registry\\Machine\\SYSTEM" #define REG_HARDWARE_KEY_NAME L"\\Registry\\Machine\\HARDWARE" +#define IsNoFileHive(Hive) ((Hive)->Flags & HIVE_NO_FILE) typedef struct _EREGISTRY_HIVE { HHIVE Hive; @@ -1032,6 +1033,14 @@ IN ULONG Flags ); +NTSTATUS +NTAPI +CmpFreeKeyByCell( + IN PHHIVE Hive, + IN HCELL_INDEX Cell, + IN BOOLEAN Unlink +); + // // Name Functions // @@ -1129,6 +1138,22 @@ IN ULONG Hash, IN PUNICODE_STRING Name, IN BOOLEAN AllowSeparators +); + +BOOLEAN +NTAPI +CmpRemoveSubKey( + IN PHHIVE Hive, + IN HCELL_INDEX ParentKey, + IN HCELL_INDEX TargetKey +); + +BOOLEAN +NTAPI +CmpMarkIndexDirty( + IN PHHIVE Hive, + HCELL_INDEX ParentKey, + HCELL_INDEX TargetKey ); // Modified: trunk/reactos/ntoskrnl/config/cmapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmapi.c (original) +++ trunk/reactos/ntoskrnl/config/cmapi.c Thu May 17 04:27:14 2007 @@ -983,3 +983,87 @@ KeLeaveCriticalRegion(); return Status; } + +NTSTATUS +NTAPI +CmDeleteKey(IN PKEY_OBJECT KeyObject) +{ + NTSTATUS Status; + PHHIVE Hive; + PCM_KEY_NODE Node, Parent; + HCELL_INDEX Cell, ParentCell; + + /* Acquire hive lock */ + KeEnterCriticalRegion(); + ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); + + /* Get the hive and node */ + Hive = &KeyObject->RegistryHive->Hive; + Cell = KeyObject->KeyCellOffset; + + /* Check if we have no parent */ + if (!KeyObject->ParentKey) + { + /* This is an attempt to delete \Registry itself! */ + Status = STATUS_CANNOT_DELETE; + goto Quickie; + } + + /* Get the key node */ + Node = (PCM_KEY_NODE)HvGetCell(Hive, Cell); + if (!Node) + { + /* Fail */ + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Quickie; + } + + /* Check if we don't have any children */ + if (!(Node->SubKeyCounts[HvStable] + Node->SubKeyCounts[HvVolatile])) + { + /* Get the parent and free the cell */ + ParentCell = Node->Parent; + Status = CmpFreeKeyByCell(Hive, Cell, TRUE); + if (NT_SUCCESS(Status)) + { + /* Get the parent node */ + Parent = (PCM_KEY_NODE)HvGetCell(Hive, ParentCell); + if (Parent) + { + /* Make sure we're dirty */ + ASSERT(HvIsCellDirty(Hive, ParentCell)); + + /* Update the write time */ + KeQuerySystemTime(&Parent->LastWriteTime); + + /* Release the cell */ + HvReleaseCell(Hive, ParentCell); + } + + /* Clear the cell */ + KeyObject->KeyCellOffset = HCELL_NIL; + } + } + else + { + /* Fail */ + Status = STATUS_CANNOT_DELETE; + } + +Quickie: + /* Release the cell */ + HvReleaseCell(Hive, Cell); + + /* Make sure we're file-backed */ + if (!(IsNoFileHive(KeyObject->RegistryHive)) || + !(IsNoFileHive(KeyObject->ParentKey->RegistryHive))) + { + /* Sync up the hives */ + CmiSyncHives(); + } + + /* Release hive lock */ + ExReleaseResourceLite(&CmpRegistryLock); + KeLeaveCriticalRegion(); + return Status; +} Modified: trunk/reactos/ntoskrnl/config/cmindex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmindex.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmindex.c (original) +++ trunk/reactos/ntoskrnl/config/cmindex.c Thu May 17 04:27:14 2007 @@ -703,12 +703,6 @@ { /* Get the Index */ IndexRoot = (PCM_KEY_INDEX)HvGetCell(Hive, Parent->SubKeyLists[i]); -#if 0 - /* Make sure we have one and that the cell is allocated */ - ASSERT((IndexRoot == NULL) || - HvIsCellAllocated(Hive, Parent->SubKeyLists[i])); -#endif - /* Fail if we don't actually have an index root */ if (!IndexRoot) return HCELL_NIL; /* Get the cell we'll need to release */ @@ -777,3 +771,343 @@ /* If we got here, then we failed */ return HCELL_NIL; } + +BOOLEAN +NTAPI +CmpMarkIndexDirty(IN PHHIVE Hive, + IN HCELL_INDEX ParentKey, + IN HCELL_INDEX TargetKey) +{ + PCM_KEY_NODE Node; + UNICODE_STRING SearchName; + BOOLEAN IsCompressed; + ULONG i, Result; + PCM_KEY_INDEX Index; + HCELL_INDEX IndexCell, Child = HCELL_NIL, CellToRelease = HCELL_NIL; + + /* Get the target key node */ + Node = (PCM_KEY_NODE)HvGetCell(Hive, TargetKey); + if (!Node) return FALSE; + + /* Check if it's compressed */ + if (Node->Flags & KEY_COMP_NAME) + { + /* Remember this for later */ + IsCompressed = TRUE; + + /* Build the search name */ + SearchName.Length = CmpCompressedNameSize(Node->Name, + Node->NameLength); + SearchName.MaximumLength = SearchName.Length; + SearchName.Buffer = ExAllocatePoolWithTag(PagedPool, + SearchName.Length, + TAG_CM); + if (!SearchName.Buffer) + { + /* Fail */ + HvReleaseCell(Hive, TargetKey); + return FALSE; + } + + /* Copy it */ + CmpCopyCompressedName(SearchName.Buffer, + SearchName.MaximumLength, + Node->Name, + Node->NameLength); + } + else + { + /* Name isn't compressed, build it directly from the node */ + IsCompressed = FALSE; + SearchName.Length = Node->NameLength; + SearchName.MaximumLength = Node->NameLength; + SearchName.Buffer = Node->Name; + } + + /* We can release the target key now */ + HvReleaseCell(Hive, TargetKey); + + /* Now get the parent key node */ + Node = (PCM_KEY_NODE)HvGetCell(Hive, ParentKey); + if (!Node) goto Quickie; + + /* Loop all hive storage */ + for (i = 0; i < Hive->StorageTypeCount; i++) + { + /* Check if any subkeys are in this index */ + if (Node->SubKeyCounts[i]) + { + /* Get the cell index */ + //ASSERT(HvIsCellAllocated(Hive, Node->SubKeyLists[i])); + IndexCell = Node->SubKeyLists[i]; + + /* Check if we had anything to release from before */ + if (CellToRelease != HCELL_NIL) + { + /* Release it now */ + HvReleaseCell(Hive, CellToRelease); + CellToRelease = HCELL_NIL; + } + + /* Get the key index for the cell */ + Index = (PCM_KEY_INDEX)HvGetCell(Hive, IndexCell); + if (!Index) goto Quickie; + + /* Release it at the next iteration or below */ + CellToRelease = IndexCell; + + /* Check if this is a root */ + if (Index->Signature == CM_KEY_INDEX_ROOT) + { + /* Get the child inside the root */ + Result = CmpFindSubKeyInRoot(Hive, Index, &SearchName, &Child); + if (Result & 0x80000000) goto Quickie; + if (Child == HCELL_NIL) continue; + + /* We found it, mark the cell dirty */ + HvMarkCellDirty(Hive, IndexCell); + + /* Check if we had anything to release from before */ + if (CellToRelease != HCELL_NIL) + { + /* Release it now */ + HvReleaseCell(Hive, CellToRelease); + CellToRelease = HCELL_NIL; + } + + /* Now this child is the index, get the actual key index */ + IndexCell = Child; + Index = (PCM_KEY_INDEX)HvGetCell(Hive, Child); + if (!Index) goto Quickie; + + /* Release it later */ + CellToRelease = Child; + } + + /* Make sure this is a valid index */ + ASSERT((Index->Signature == CM_KEY_INDEX_LEAF) || + (Index->Signature == CM_KEY_FAST_LEAF) || + (Index->Signature == CM_KEY_HASH_LEAF)); + + /* Find the child in the leaf */ + Result = CmpFindSubKeyInLeaf(Hive, Index, &SearchName, &Child); + if (Result & 0x80000000) goto Quickie; + if (Child != HCELL_NIL) + { + /* We found it, free the name now */ + if (IsCompressed) ExFreePool(SearchName.Buffer); + + /* Release the parent key */ + HvReleaseCell(Hive, ParentKey); + + /* Check if we had a left over cell to release */ + if (CellToRelease != HCELL_NIL) + { + /* Release it */ + HvReleaseCell(Hive, CellToRelease); + } + + /* And mark the index cell dirty */ + HvMarkCellDirty(Hive, IndexCell); + return TRUE; + } + } + } + +Quickie: + /* Release any cells that we still hold */ + if (Node) HvReleaseCell(Hive, ParentKey); + if (CellToRelease != HCELL_NIL) HvReleaseCell(Hive, CellToRelease); + + /* Free the search name and return failure */ + if (IsCompressed) ExFreePool(SearchName.Buffer); + return FALSE; +} + +BOOLEAN +NTAPI +CmpRemoveSubKey(IN PHHIVE Hive, + IN HCELL_INDEX ParentKey, + IN HCELL_INDEX TargetKey) +{ + PCM_KEY_NODE Node; + UNICODE_STRING SearchName; + BOOLEAN IsCompressed; + WCHAR Buffer[50]; + HCELL_INDEX RootCell = HCELL_NIL, LeafCell, ChildCell; + PCM_KEY_INDEX Root = NULL, Leaf; + PCM_KEY_FAST_INDEX Child; + ULONG Storage, RootIndex = 0x80000000, LeafIndex; + BOOLEAN Result = FALSE; + HCELL_INDEX CellToRelease1 = HCELL_NIL, CellToRelease2 = HCELL_NIL; + + /* Get the target key node */ + Node = (PCM_KEY_NODE)HvGetCell(Hive, TargetKey); + if (!Node) return FALSE; + + /* Make sure it's dirty, then release it */ + ASSERT(HvIsCellDirty(Hive, TargetKey)); + HvReleaseCell(Hive, TargetKey); + + /* Check if the name is compressed */ + if (Node->Flags & KEY_COMP_NAME) + { + /* Remember for later */ + IsCompressed = TRUE; + + /* Build the search name */ + SearchName.Length = CmpCompressedNameSize(Node->Name, + Node->NameLength); + SearchName.MaximumLength = SearchName.Length; + + /* Do we need an extra bufer? */ + if (SearchName.MaximumLength > sizeof(Buffer)) + { + /* Allocate one */ + SearchName.Buffer = ExAllocatePoolWithTag(PagedPool, + SearchName.Length, + TAG_CM); + if (!SearchName.Buffer) return FALSE; + } + else + { + /* Otherwise, use our local stack buffer */ + SearchName.Buffer = Buffer; + } + + /* Copy the compressed name */ + CmpCopyCompressedName(SearchName.Buffer, + SearchName.MaximumLength, + Node->Name, + Node->NameLength); + } + else + { + /* It's not compressed, build the name directly from the node */ + IsCompressed = FALSE; + SearchName.Length = Node->NameLength; + SearchName.MaximumLength = Node->NameLength; + SearchName.Buffer = Node->Name; + } + + /* Now get the parent node */ + Node = (PCM_KEY_NODE)HvGetCell(Hive, ParentKey); + if (!Node) goto Exit; + + /* Make sure it's dirty, then release it */ + ASSERT(HvIsCellDirty(Hive, ParentKey)); + HvReleaseCell(Hive, ParentKey); + + /* Get the storage type and make sure it's not empty */ + Storage = HvGetCellType(TargetKey); + ASSERT(Node->SubKeyCounts[Storage] != 0); + //ASSERT(HvIsCellAllocated(Hive, Node->SubKeyLists[Storage])); + + /* Get the leaf cell now */ + LeafCell = Node->SubKeyLists[Storage]; + Leaf = (PCM_KEY_INDEX)HvGetCell(Hive, LeafCell); + if (!Leaf) goto Exit; + + /* Remember to release it later */ + CellToRelease1 = LeafCell; + + /* Check if the leaf is a root */ + if (Leaf->Signature == CM_KEY_INDEX_ROOT) + { + /* Find the child inside the root */ + RootIndex = CmpFindSubKeyInRoot(Hive, Leaf, &SearchName, &ChildCell); + if (RootIndex & 0x80000000) goto Exit; + ASSERT(ChildCell != FALSE); + + /* The root cell is now this leaf */ + Root = Leaf; + RootCell = LeafCell; + + /* And the new leaf is now this child */ + LeafCell = ChildCell; + Leaf = (PCM_KEY_INDEX)HvGetCell(Hive, LeafCell); + if (!Leaf) goto Exit; + + /* Remember to release it later */ + CellToRelease2 = LeafCell; + } + + /* Make sure the leaf is valid */ + ASSERT((Leaf->Signature == CM_KEY_INDEX_LEAF) || + (Leaf->Signature == CM_KEY_FAST_LEAF) || + (Leaf->Signature == CM_KEY_HASH_LEAF)); + + /* Now get the child in the leaf */ + LeafIndex = CmpFindSubKeyInLeaf(Hive, Leaf, &SearchName, &ChildCell); + if (LeafIndex & 0x80000000) goto Exit; + ASSERT(ChildCell != HCELL_NIL); + + /* Decrement key counts and check if this was the last leaf entry */ + Node->SubKeyCounts[Storage]--; + if (!(--Leaf->Count)) + { + /* Free the leaf */ + HvFreeCell(Hive, LeafCell); + + /* Check if we were inside a root */ + if (Root) + { + /* Decrease the root count too, since the leaf is going away */ + if (!(--Root->Count)) + { + /* The root is gone too,n ow */ + HvFreeCell(Hive, RootCell); + Node->SubKeyLists[Storage] = HCELL_NIL; + } + else if (RootIndex < Root->Count) + { + /* Bring everything up by one */ + RtlMoveMemory(&Root->List[RootIndex], + &Root->List[RootIndex + 1], + (Root->Count - RootIndex) * sizeof(HCELL_INDEX)); + } + } + else + { + /* Otherwise, just clear the cell */ + Node->SubKeyLists[Storage] = HCELL_NIL; + } + } + else if (LeafIndex < Leaf->Count) + { + /* Was the leaf a normal index? */ + if (Leaf->Signature == CM_KEY_INDEX_LEAF) + { + /* Bring everything up by one */ + RtlMoveMemory(&Leaf->List[LeafIndex], + &Leaf->List[LeafIndex + 1], + (Leaf->Count - LeafIndex) * sizeof(HCELL_INDEX)); + } + else + { + /* This is a fast index, bring everything up by one */ + Child = (PCM_KEY_FAST_INDEX)Leaf; + RtlMoveMemory(&Child->List[LeafIndex], + &Child->List[LeafIndex+1], + (Child->Count - LeafIndex) * sizeof(CM_INDEX)); + } + } + + /* If we got here, now we're done */ + Result = TRUE; + +Exit: + /* Release any cells we may have been holding */ + if (CellToRelease1 != HCELL_NIL) HvReleaseCell(Hive, CellToRelease1); + if (CellToRelease2 != HCELL_NIL) HvReleaseCell(Hive, CellToRelease2); + + /* Check if the name was compressed and not inside our local buffer */ + if ((IsCompressed) && (SearchName.MaximumLength > sizeof(Buffer))) + { + /* Free the buffer we allocated */ + ExFreePool(SearchName.Buffer); + } + + /* Return the result */ + return Result; +} Added: trunk/reactos/ntoskrnl/config/cmkeydel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmkeydel.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmkeydel.c (added) +++ trunk/reactos/ntoskrnl/config/cmkeydel.c Thu May 17 04:27:14 2007 @@ -1,0 +1,221 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/config/cmkeydel.c + * PURPOSE: Configuration Manager - Key Body Deletion + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include "ntoskrnl.h" +#include "cm.h" +#define NDEBUG +#include "debug.h" + +/* FUNCTIONS *****************************************************************/ + +BOOLEAN +NTAPI +CmpMarkKeyDirty(IN PHHIVE Hive, + IN HCELL_INDEX Cell, + IN BOOLEAN CheckNoSubkeys) +{ + PCELL_DATA CellData, ListData, SecurityData, ValueData; + ULONG i; + + /* Get the cell data for our target */ + CellData = HvGetCell(Hive, Cell); + if (!CellData) return FALSE; + + /* Check if sanity checks requested */ + if (CheckNoSubkeys) + { + /* Do them */ + ASSERT(CellData->u.KeyNode.SubKeyCounts[HvStable] == 0); + ASSERT(CellData->u.KeyNode.SubKeyCounts[HvVolatile] == 0); + } + + /* If this is an exit hive, there's nothing to do */ + if (CellData->u.KeyNode.Flags & KEY_HIVE_EXIT) + { + /* Release the cell and get out */ + HvReleaseCell(Hive, Cell); + return TRUE; + } + + /* Otherwise, mark it dirty and release it */ + HvMarkCellDirty(Hive, Cell); + HvReleaseCell(Hive, Cell); + + /* Check if we have a class */ + if (CellData->u.KeyNode.Class != HCELL_NIL) + { + /* Mark it dirty */ + HvMarkCellDirty(Hive, CellData->u.KeyNode.Class); + } + + /* Check if we have security */ + if (CellData->u.KeyNode.Security != HCELL_NIL) + { + /* Mark it dirty */ + HvMarkCellDirty(Hive, CellData->u.KeyNode.Security); + + /* Get the security data and release it */ + SecurityData = HvGetCell(Hive, CellData->u.KeyNode.Security); + if (!SecurityData) ASSERT(FALSE); + HvReleaseCell(Hive, CellData->u.KeyNode.Security); + + /* Mark the security links dirty too */ + HvMarkCellDirty(Hive, SecurityData->u.KeySecurity.Flink); + HvMarkCellDirty(Hive, SecurityData->u.KeySecurity.Blink); + } + + /* Check if we have any values */ + if (CellData->u.KeyNode.ValueList.Count > 0) + { + /* Dirty the value list */ + HvMarkCellDirty(Hive, CellData->u.KeyNode.ValueList.List); + + /* Get the list data itself, and release it */ + ListData = HvGetCell(Hive, CellData->u.KeyNode.ValueList.List); + if (!ListData) ASSERT(FALSE); + HvReleaseCell(Hive, CellData->u.KeyNode.ValueList.List); + + /* Loop all values */ + for (i = 0; i < CellData->u.KeyNode.ValueList.Count; i++) + { + /* Dirty each value */ + HvMarkCellDirty(Hive, ListData->u.KeyList[i]); + + /* Get the value data and release it */ + ValueData = HvGetCell(Hive, ListData->u.KeyList[i]); + if (ValueData) ASSERT(FALSE); + HvReleaseCell(Hive,ListData->u.KeyList[i]); + + /* Mark the value data dirty too */ + if (!CmpMarkValueDataDirty(Hive, &ValueData->u.KeyValue)) + { + /* Failure */ + return FALSE; + } + } + } + + /* If this is an entry hive, we're done */ + if (CellData->u.KeyNode.Flags & KEY_HIVE_ENTRY) return TRUE; + + /* Otherwise mark the index dirty too */ + if (!CmpMarkIndexDirty(Hive, CellData->u.KeyNode.Parent, Cell)) + { + /* Failure */ + return FALSE; + } + + /* Finally, mark the parent dirty */ + HvMarkCellDirty(Hive, CellData->u.KeyNode.Parent); + return TRUE; +} + +BOOLEAN +NTAPI +CmpFreeKeyBody(IN PHHIVE Hive, + IN HCELL_INDEX Cell) +{ + PCELL_DATA CellData; + + /* Get the key node */ + CellData = HvGetCell(Hive, Cell); + if (!CellData) ASSERT(FALSE); + + /* Check if we can delete the child cells */ + if (!(CellData->u.KeyNode.Flags & KEY_HIVE_EXIT)) + { + /* Check if we have a security cell */ + if (CellData->u.KeyNode.Security != HCELL_NIL) + { + /* Free the security cell */ + HvFreeCell(Hive, CellData->u.KeyNode.Security); + } + + /* Check if we have a class */ + if (CellData->u.KeyNode.ClassLength > 0) + { + /* Free it */ + HvFreeCell(Hive, CellData->u.KeyNode.Class); + } + } + + /* Release and free the cell */ + HvReleaseCell(Hive, Cell); + HvFreeCell(Hive, Cell); + return TRUE; +} + +NTSTATUS +NTAPI +CmpFreeKeyByCell(IN PHHIVE Hive, + IN HCELL_INDEX Cell, + IN BOOLEAN Unlink) +{ + PCELL_DATA CellData, ParentData, ListData; + ULONG i; + BOOLEAN Result; + + /* Mark the entire key dirty */ + CmpMarkKeyDirty(Hive, Cell ,TRUE); + + /* Get the target node and release it */ + CellData = HvGetCell(Hive, Cell); + if (!CellData) ASSERT(FALSE); + HvReleaseCell(Hive, Cell); + + /* Make sure we don't have subkeys */ + ASSERT((CellData->u.KeyNode.SubKeyCounts[HvStable] + + CellData->u.KeyNode.SubKeyCounts[HvVolatile]) == 0); + + /* Check if we have to unlink */ + if (Unlink) + { + /* Remove the subkey */ + Result = CmpRemoveSubKey(Hive, CellData->u.KeyNode.Parent, Cell); + if (!Result) return STATUS_INSUFFICIENT_RESOURCES; + + /* Get the parent node and release it */ + ParentData = HvGetCell(Hive, CellData->u.KeyNode.Parent); + if (!ParentData) ASSERT(FALSE); + HvReleaseCell(Hive, CellData->u.KeyNode.Parent); + + /* Check if the parent node has no more subkeys */ + if (!(ParentData->u.KeyNode.SubKeyCounts[HvStable] + + ParentData->u.KeyNode.SubKeyCounts[HvVolatile])) + { + /* Then free the cached name/class lengths */ + ParentData->u.KeyNode.MaxNameLen = 0; + ParentData->u.KeyNode.MaxClassLen = 0; + } + } + + /* Check if we have any values */ + if (CellData->u.KeyNode.ValueList.Count > 0) + { + /* Get the value list and release it */ + ListData = HvGetCell(Hive, CellData->u.KeyNode.ValueList.List); + if (!ListData) ASSERT(FALSE); + HvReleaseCell(Hive, CellData->u.KeyNode.ValueList.List); + + /* Loop every value */ + for (i = 0; i < CellData->u.KeyNode.ValueList.Count; i++) + { + /* Free it */ + if (!CmpFreeValue(Hive, ListData->u.KeyList[i])) ASSERT(FALSE); + } + + /* Free the value list */ + HvFreeCell(Hive, CellData->u.KeyNode.ValueList.List); + } + + /* Free the key body itself, and then return our status */ + if (!CmpFreeKeyBody(Hive, Cell)) return STATUS_INSUFFICIENT_RESOURCES; + return STATUS_SUCCESS; +} Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rbuild Thu May 17 04:27:14 2007 @@ -99,6 +99,7 @@ <file>cminit.c</file> <file>cmhook.c</file> <file>cmkcbncb.c</file> + <file>cmkeydel.c</file> <file>cmmapvw.c</file> <file>cmname.c</file> <file>cmparse.c</file>

1 0

[greatlrd] 26816: fixing some smaller bugs found by the regress test
by greatlrd＠svn.reactos.org 16 May '07

16 May '07

Author: greatlrd Date: Thu May 17 02:58:25 2007 New Revision: 26816 URL: http://svn.reactos.org/svn/reactos?rev=26816&view=rev Log: fixing some smaller bugs found by the regress test Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c trunk/reactos/dll/directx/ddraw/main.c trunk/reactos/dll/directx/ddraw/startup.c Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/createsurface.c (original) +++ trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Thu May 17 02:58:25 2007 @@ -81,6 +81,8 @@ desc.dwFlags = desc.dwFlags & DDSD_ALL; } + + /* more code will follow */ Modified: trunk/reactos/dll/directx/ddraw/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main.c?r… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main.c (original) +++ trunk/reactos/dll/directx/ddraw/main.c Thu May 17 02:58:25 2007 @@ -40,11 +40,6 @@ */ DX_WINDBG_trace(); - /* check the pointer if it vaild to read from */ - if (IsBadWritePtr( lplpDD, sizeof( LPVOID )) ) - { - return DDERR_INVALIDPARAMS; - } /* check see if pUnkOuter is null or not */ if (pUnkOuter) @@ -74,12 +69,6 @@ this api is finish and is working as it should */ DX_WINDBG_trace(); - - /* check the pointer if it vaild to read from */ - if (IsBadWritePtr( lplpDD, sizeof( LPVOID )) ) - { - return DDERR_INVALIDPARAMS; - } /* check see if pUnkOuter is null or not */ if (pUnkOuter) 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 Thu May 17 02:58:25 2007 @@ -25,12 +25,21 @@ Create_DirectDraw (LPGUID pGUID, LPDIRECTDRAW* pIface, REFIID id, BOOL ex) { - LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)*pIface; + LPDDRAWI_DIRECTDRAW_INT This; DX_WINDBG_trace(); - if (This == NULL) - { + if ((IsBadReadPtr(pIface,sizeof(LPDIRECTDRAW))) || + (IsBadWritePtr(pIface,sizeof(LPDIRECTDRAW)))) + { + return DDERR_INVALIDPARAMS; + } + + This = (LPDDRAWI_DIRECTDRAW_INT)*pIface; + + if (IsBadReadPtr(This,sizeof(LPDIRECTDRAW))) + { + DX_STUB_str("1. no linking\n"); /* We do not have a DirectDraw interface, we need alloc it*/ LPDDRAWI_DIRECTDRAW_INT memThis; @@ -47,6 +56,7 @@ } else { + DX_STUB_str("2.linking\n"); /* We got the DirectDraw interface alloc and we need create the link */ LPDDRAWI_DIRECTDRAW_INT newThis; newThis = DxHeapMemAlloc(sizeof(DDRAWI_DIRECTDRAW_INT)); @@ -269,7 +279,7 @@ This->lpLcl->hDD = This->lpLcl->lpGbl->hDD; ddgbl.hDD = This->lpLcl->lpGbl->hDD; - DX_STUB_str("DD_OK"); + DX_STUB_str("DD_OK\n"); return DD_OK; } @@ -374,10 +384,13 @@ if (reenable == FALSE) { - ddgbl.lpDDCBtmp = DxHeapMemAlloc(sizeof(DDHAL_CALLBACKS)); - if ( ddgbl.lpDDCBtmp == NULL) - { - return DD_FALSE; + if (ddgbl.lpDDCBtmp == NULL) + { + ddgbl.lpDDCBtmp = DxHeapMemAlloc(sizeof(DDHAL_CALLBACKS)); + if ( ddgbl.lpDDCBtmp == NULL) + { + return DD_FALSE; + } } } else @@ -425,7 +438,7 @@ /* Alloc mpFourCC */ mpFourCC = NULL; - if (mHALInfo.ddCaps.dwNumFourCCCodes) + if (mHALInfo.ddCaps.dwNumFourCCCodes > 0 ) { mpFourCC = (DWORD *) DxHeapMemAlloc(sizeof(DWORD) * mHALInfo.ddCaps.dwNumFourCCCodes); if (mpFourCC == NULL) @@ -438,8 +451,7 @@ /* Alloc mpTextures */ mpTextures = NULL; - - if (mD3dDriverData.dwNumTextureFormats) + if (mD3dDriverData.dwNumTextureFormats > 0) { mpTextures = (DDSURFACEDESC*) DxHeapMemAlloc(sizeof(DDSURFACEDESC) * mD3dDriverData.dwNumTextureFormats); if (mpTextures == NULL)

1 0

[mbosma] 26815: GetAvailableVidMem-Test
by mbosma＠svn.reactos.org 16 May '07

16 May '07

Author: mbosma Date: Thu May 17 02:19:07 2007 New Revision: 26815 URL: http://svn.reactos.org/svn/reactos?rev=26815&view=rev Log: GetAvailableVidMem-Test Modified: trunk/rostests/dxtest/ddraw/testlist.cpp trunk/rostests/dxtest/ddraw/tests/CreateDDraw.cpp Modified: trunk/rostests/dxtest/ddraw/testlist.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/testlist.cpp… ============================================================================== --- trunk/rostests/dxtest/ddraw/testlist.cpp (original) +++ trunk/rostests/dxtest/ddraw/testlist.cpp Thu May 17 02:19:07 2007 @@ -14,6 +14,7 @@ { { "IDirectDraw: COM Stuff", Test_CreateDDraw }, { "IDirectDraw: Display Modes", Test_DisplayModes }, + { "IDirectDraw: Available Video Memory", Test_GetAvailableVidMem }, { "IDirectDraw: Cooperative Levels", Test_SetCooperativeLevel }, { "IDirectDraw: CreateSurface", Test_CreateSurface }, }; Modified: trunk/rostests/dxtest/ddraw/tests/CreateDDraw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/tests/Create… ============================================================================== --- trunk/rostests/dxtest/ddraw/tests/CreateDDraw.cpp (original) +++ trunk/rostests/dxtest/ddraw/tests/CreateDDraw.cpp Thu May 17 02:19:07 2007 @@ -79,6 +79,32 @@ return TRUE; } +BOOL Test_GetAvailableVidMem (INT* passed, INT* failed) +{ + LPDIRECTDRAW7 DirectDraw; + + /* Preparations */ + if (DirectDrawCreateEx(NULL, (VOID**)&DirectDraw, IID_IDirectDraw7, NULL) != DD_OK) + { + printf("ERROR: Failed to set up ddraw\n"); + return FALSE; + } + + /* Here we go */ + DWORD Total, Free; + DDSCAPS2 Caps = { 0 }; + TEST (DirectDraw->GetAvailableVidMem(&Caps, NULL, NULL) == DDERR_INVALIDPARAMS); + TEST (DirectDraw->GetAvailableVidMem(NULL, &Total, &Free) == DDERR_INVALIDPARAMS); + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK && Total == 0 && Free == 0 ); + + Caps.dwCaps = DDSCAPS_VIDEOMEMORY; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); + + DirectDraw->Release(); + + return TRUE; +} + LONG WINAPI BasicWindowProc (HWND hwnd, UINT message, UINT wParam, LONG lParam) { switch (message)

1 0

[greatlrd] 26814: Fixing a msvc7 comping issue
by greatlrd＠svn.reactos.org 16 May '07

16 May '07

Author: greatlrd Date: Thu May 17 01:03:02 2007 New Revision: 26814 URL: http://svn.reactos.org/svn/reactos?rev=26814&view=rev Log: Fixing a msvc7 comping issue Added: trunk/rostests/dxtest/ddraw/ddraw_test.cpp - copied, changed from r26809, trunk/rostests/dxtest/ddraw/ddraw_test.c Removed: trunk/rostests/dxtest/ddraw/ddraw_test.c Modified: trunk/rostests/dxtest/ddraw/ddraw.rbuild trunk/rostests/dxtest/ddraw/testlist.cpp Modified: trunk/rostests/dxtest/ddraw/ddraw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/ddraw.rbuild… ============================================================================== --- trunk/rostests/dxtest/ddraw/ddraw.rbuild (original) +++ trunk/rostests/dxtest/ddraw/ddraw.rbuild Thu May 17 01:03:02 2007 @@ -7,6 +7,6 @@ <library>gdi32</library> <library>ddraw</library> <library>dxguid</library> - <file>ddraw_test.c</file> + <file>ddraw_test.cpp</file> <file>testlist.cpp</file> </module> Removed: trunk/rostests/dxtest/ddraw/ddraw_test.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/ddraw_test.c… ============================================================================== --- trunk/rostests/dxtest/ddraw/ddraw_test.c (original) +++ trunk/rostests/dxtest/ddraw/ddraw_test.c (removed) @@ -1,51 +1,0 @@ -#include <stdio.h> -#include <stdlib.h> - -#include "ddrawtest.h" - -INT NumTests(void); - -int main(int argc, char *argv[]) -{ - INT Num = NumTests(); - INT i, j; - INT passed, failed, opassed, ofailed; - - opassed = 0; - ofailed = 0; - printf("DirectDraw tests\n"); - if (argc > 1) - { - for (i = 1; i < argc; i++) - { - for (j = 0; j < NumTests(); j++) - { - if (stricmp(argv[i], TestList[j].Test) == 0) - { - passed = 0; - failed = 0; - TestList[j].Proc(&passed, &failed); - opassed += passed; - ofailed += failed; - printf(" tests: %d, passed: %d, failed: %d\n\n", passed+failed, passed, failed); - } - } - } - } - else - { - for (i = 0; i < Num; i++) - { - passed = 0; - failed = 0; - printf("Test: %s\n", TestList[i].Test); - TestList[i].Proc(&passed, &failed); - opassed += passed; - ofailed += failed; - printf(" tests: %d, passed: %d, failed: %d\n\n", passed+failed, passed, failed); - } - } - printf("\nOverall tests: %d, passed: %d, failed: %d\n", opassed+ofailed, opassed, ofailed); - - return ofailed; -} Copied: trunk/rostests/dxtest/ddraw/ddraw_test.cpp (from r26809, trunk/rostests/dxtest/ddraw/ddraw_test.c) URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/ddraw_test.c… ============================================================================== --- trunk/rostests/dxtest/ddraw/ddraw_test.c (original) +++ trunk/rostests/dxtest/ddraw/ddraw_test.cpp Thu May 17 01:03:02 2007 @@ -20,7 +20,7 @@ { for (j = 0; j < NumTests(); j++) { - if (stricmp(argv[i], TestList[j].Test) == 0) + if (_stricmp(argv[i], TestList[j].Test) == 0) { passed = 0; failed = 0; Modified: trunk/rostests/dxtest/ddraw/testlist.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/testlist.cpp… ============================================================================== --- trunk/rostests/dxtest/ddraw/testlist.cpp (original) +++ trunk/rostests/dxtest/ddraw/testlist.cpp Thu May 17 01:03:02 2007 @@ -19,7 +19,7 @@ }; /* The function that gives us the number of tests */ -extern "C" INT NumTests(void) +INT NumTests(void) { return sizeof(TestList) / sizeof(TEST); }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs