Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 22498: Adding design for the network config
by greatlrd＠svn.reactos.org 22 Jun '06

22 Jun '06

Author: greatlrd Date: Thu Jun 22 16:00:58 2006 New Revision: 22498 URL: http://svn.reactos.ru/svn/reactos?rev=22498&view=rev Log: Adding design for the network config Modified: trunk/tools/Qemu GUI/frmMain.cs Modified: trunk/tools/Qemu GUI/frmMain.cs URL: http://svn.reactos.ru/svn/reactos/trunk/tools/Qemu%20GUI/frmMain.cs?rev=224… ============================================================================== --- trunk/tools/Qemu GUI/frmMain.cs (original) +++ trunk/tools/Qemu GUI/frmMain.cs Thu Jun 22 16:00:58 2006 @@ -127,6 +127,25 @@ private ComboBox cboVDKDrive; private ComboBox cboMachine; private Label lblImageSizeMB; + private GroupBox groupBox3; + private GroupBox groupBox1; + private NumericUpDown numericUpDown9; + private NumericUpDown numericUpDown10; + private NumericUpDown numericUpDown11; + private NumericUpDown numericUpDown12; + private Label label3; + private NumericUpDown numericUpDown5; + private NumericUpDown numericUpDown6; + private NumericUpDown numericUpDown7; + private NumericUpDown numericUpDown8; + private Label label2; + private NumericUpDown numericUpDown4; + private NumericUpDown numericUpDown3; + private NumericUpDown numericUpDown2; + private NumericUpDown numericUpDown1; + private Label label1; + private RadioButton radioButton2; + private RadioButton radioButton1; private QEmu qemu; public frmMain() @@ -274,6 +293,25 @@ this.saveFileDialog1 = new System.Windows.Forms.SaveFileDialog(); this.btnLoad = new System.Windows.Forms.Button(); this.btnSave = new System.Windows.Forms.Button(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.groupBox3 = new System.Windows.Forms.GroupBox(); + this.radioButton1 = new System.Windows.Forms.RadioButton(); + this.radioButton2 = new System.Windows.Forms.RadioButton(); + this.label1 = new System.Windows.Forms.Label(); + this.numericUpDown1 = new System.Windows.Forms.NumericUpDown(); + this.numericUpDown2 = new System.Windows.Forms.NumericUpDown(); + this.numericUpDown3 = new System.Windows.Forms.NumericUpDown(); + this.numericUpDown4 = new System.Windows.Forms.NumericUpDown(); + this.numericUpDown5 = new System.Windows.Forms.NumericUpDown(); + this.numericUpDown6 = new System.Windows.Forms.NumericUpDown(); + this.numericUpDown7 = new System.Windows.Forms.NumericUpDown(); + this.numericUpDown8 = new System.Windows.Forms.NumericUpDown(); + this.label2 = new System.Windows.Forms.Label(); + this.numericUpDown9 = new System.Windows.Forms.NumericUpDown(); + this.numericUpDown10 = new System.Windows.Forms.NumericUpDown(); + this.numericUpDown11 = new System.Windows.Forms.NumericUpDown(); + this.numericUpDown12 = new System.Windows.Forms.NumericUpDown(); + this.label3 = new System.Windows.Forms.Label(); this.grpMachine.SuspendLayout(); this.HardDisk2.SuspendLayout(); this.tabMisc.SuspendLayout(); @@ -303,9 +341,23 @@ this.grpSerial.SuspendLayout(); this.grpParallel.SuspendLayout(); this.groupBox16.SuspendLayout(); + this.tabNetwork.SuspendLayout(); this.tabPaths.SuspendLayout(); this.groupBox2.SuspendLayout(); this.tabAbout.SuspendLayout(); + this.groupBox3.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown6)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown7)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown8)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown9)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown10)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown11)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown12)).BeginInit(); this.SuspendLayout(); // // grpMachine @@ -1294,6 +1346,8 @@ // // tabNetwork // + this.tabNetwork.Controls.Add(this.groupBox3); + this.tabNetwork.Controls.Add(this.groupBox1); this.tabNetwork.Location = new System.Drawing.Point(4, 22); this.tabNetwork.Name = "tabNetwork"; this.tabNetwork.Size = new System.Drawing.Size(460, 201); @@ -1430,6 +1484,354 @@ this.btnSave.TabIndex = 6; this.btnSave.Text = "Save"; this.btnSave.Click += new System.EventHandler(this.btnSave_Click); + // + // groupBox1 + // + this.groupBox1.Location = new System.Drawing.Point(13, 13); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(200, 176); + this.groupBox1.TabIndex = 0; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "Buildin Server"; + // + // groupBox3 + // + this.groupBox3.Controls.Add(this.numericUpDown9); + this.groupBox3.Controls.Add(this.numericUpDown10); + this.groupBox3.Controls.Add(this.numericUpDown11); + this.groupBox3.Controls.Add(this.numericUpDown12); + this.groupBox3.Controls.Add(this.label3); + this.groupBox3.Controls.Add(this.numericUpDown5); + this.groupBox3.Controls.Add(this.numericUpDown6); + this.groupBox3.Controls.Add(this.numericUpDown7); + this.groupBox3.Controls.Add(this.numericUpDown8); + this.groupBox3.Controls.Add(this.label2); + this.groupBox3.Controls.Add(this.numericUpDown4); + this.groupBox3.Controls.Add(this.numericUpDown3); + this.groupBox3.Controls.Add(this.numericUpDown2); + this.groupBox3.Controls.Add(this.numericUpDown1); + this.groupBox3.Controls.Add(this.label1); + this.groupBox3.Controls.Add(this.radioButton2); + this.groupBox3.Controls.Add(this.radioButton1); + this.groupBox3.Location = new System.Drawing.Point(231, 13); + this.groupBox3.Name = "groupBox3"; + this.groupBox3.Size = new System.Drawing.Size(214, 176); + this.groupBox3.TabIndex = 1; + this.groupBox3.TabStop = false; + this.groupBox3.Text = "Network Config"; + // + // radioButton1 + // + this.radioButton1.AutoSize = true; + this.radioButton1.Location = new System.Drawing.Point(6, 19); + this.radioButton1.Name = "radioButton1"; + this.radioButton1.Size = new System.Drawing.Size(77, 17); + this.radioButton1.TabIndex = 0; + this.radioButton1.TabStop = true; + this.radioButton1.Text = "Use DHCP"; + this.radioButton1.UseVisualStyleBackColor = true; + // + // radioButton2 + // + this.radioButton2.AutoSize = true; + this.radioButton2.Location = new System.Drawing.Point(101, 19); + this.radioButton2.Name = "radioButton2"; + this.radioButton2.Size = new System.Drawing.Size(65, 17); + this.radioButton2.TabIndex = 1; + this.radioButton2.TabStop = true; + this.radioButton2.Text = "Static IP"; + this.radioButton2.UseVisualStyleBackColor = true; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(6, 51); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(52, 13); + this.label1.TabIndex = 2; + this.label1.Text = "IP Adress"; + // + // numericUpDown1 + // + this.numericUpDown1.Location = new System.Drawing.Point(6, 67); + this.numericUpDown1.Maximum = new decimal(new int[] { + 255, + 0, + 0, + 0}); + this.numericUpDown1.Minimum = new decimal(new int[] { + 1, + 0, + 0, + 0}); + this.numericUpDown1.Name = "numericUpDown1"; + this.numericUpDown1.Size = new System.Drawing.Size(46, 20); + this.numericUpDown1.TabIndex = 14; + this.numericUpDown1.Value = new decimal(new int[] { + 1, + 0, + 0, + 0}); + // + // numericUpDown2 + // + this.numericUpDown2.Location = new System.Drawing.Point(58, 67); + this.numericUpDown2.Maximum = new decimal(new int[] { + 255, + 0, + 0, + 0}); + this.numericUpDown2.Minimum = new decimal(new int[] { + 1, + 0, + 0, + 0}); + this.numericUpDown2.Name = "numericUpDown2"; + this.numericUpDown2.Size = new System.Drawing.Size(46, 20); + this.numericUpDown2.TabIndex = 15; + this.numericUpDown2.Value = new decimal(new int[] { + 1, + 0, + 0, + 0}); + // + // numericUpDown3 + // + this.numericUpDown3.Location = new System.Drawing.Point(110, 67); + this.numericUpDown3.Maximum = new decimal(new int[] { + 255, + 0, + 0, + 0}); + this.numericUpDown3.Minimum = new decimal(new int[] { + 1, + 0, + 0, + 0}); + this.numericUpDown3.Name = "numericUpDown3"; + this.numericUpDown3.Size = new System.Drawing.Size(46, 20); + this.numericUpDown3.TabIndex = 16; + this.numericUpDown3.Value = new decimal(new int[] { + 1, + 0, + 0, + 0}); + // + // numericUpDown4 + // + this.numericUpDown4.Location = new System.Drawing.Point(162, 67); + this.numericUpDown4.Maximum = new decimal(new int[] { + 255, + 0, + 0, + 0}); + this.numericUpDown4.Minimum = new decimal(new int[] { + 1, + 0, + 0, + 0}); + this.numericUpDown4.Name = "numericUpDown4"; + this.numericUpDown4.Size = new System.Drawing.Size(46, 20); + this.numericUpDown4.TabIndex = 17; + this.numericUpDown4.Value = new decimal(new int[] { + 1, + 0, + 0, + 0}); + // + // numericUpDown5 + // + this.numericUpDown5.Location = new System.Drawing.Point(162, 108); + this.numericUpDown5.Maximum = new decimal(new int[] { + 255, + 0, + 0, + 0}); + this.numericUpDown5.Minimum = new decimal(new int[] { + 1, + 0, + 0, + 0}); + this.numericUpDown5.Name = "numericUpDown5"; + this.numericUpDown5.Size = new System.Drawing.Size(46, 20); + this.numericUpDown5.TabIndex = 22; + this.numericUpDown5.Value = new decimal(new int[] { + 1, + 0, + 0, + 0}); + // + // numericUpDown6 + // + this.numericUpDown6.Location = new System.Drawing.Point(110, 108); + this.numericUpDown6.Maximum = new decimal(new int[] { + 255, + 0, + 0, + 0}); + this.numericUpDown6.Minimum = new decimal(new int[] { + 1, + 0, + 0, + 0}); + this.numericUpDown6.Name = "numericUpDown6"; + this.numericUpDown6.Size = new System.Drawing.Size(46, 20); + this.numericUpDown6.TabIndex = 21; + this.numericUpDown6.Value = new decimal(new int[] { + 1, + 0, + 0, + 0}); + // + // numericUpDown7 + // + this.numericUpDown7.Location = new System.Drawing.Point(58, 108); + this.numericUpDown7.Maximum = new decimal(new int[] { + 255, + 0, + 0, + 0}); + this.numericUpDown7.Minimum = new decimal(new int[] { + 1, + 0, + 0, + 0}); + this.numericUpDown7.Name = "numericUpDown7"; + this.numericUpDown7.Size = new System.Drawing.Size(46, 20); + this.numericUpDown7.TabIndex = 20; + this.numericUpDown7.Value = new decimal(new int[] { + 1, + 0, + 0, + 0}); + // + // numericUpDown8 + // + this.numericUpDown8.Location = new System.Drawing.Point(6, 108); + this.numericUpDown8.Maximum = new decimal(new int[] { + 255, + 0, + 0, + 0}); + this.numericUpDown8.Minimum = new decimal(new int[] { + 1, + 0, + 0, + 0}); + this.numericUpDown8.Name = "numericUpDown8"; + this.numericUpDown8.Size = new System.Drawing.Size(46, 20); + this.numericUpDown8.TabIndex = 19; + this.numericUpDown8.Value = new decimal(new int[] { + 1, + 0, + 0, + 0}); + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(6, 92); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(75, 13); + this.label2.TabIndex = 18; + this.label2.Text = "Network mask"; + // + // numericUpDown9 + // + this.numericUpDown9.Location = new System.Drawing.Point(162, 150); + this.numericUpDown9.Maximum = new decimal(new int[] { + 255, + 0, + 0, + 0}); + this.numericUpDown9.Minimum = new decimal(new int[] { + 1, + 0, + 0, + 0}); + this.numericUpDown9.Name = "numericUpDown9"; + this.numericUpDown9.Size = new System.Drawing.Size(46, 20); + this.numericUpDown9.TabIndex = 27; + this.numericUpDown9.Value = new decimal(new int[] { + 1, + 0, + 0, + 0}); + // + // numericUpDown10 + // + this.numericUpDown10.Location = new System.Drawing.Point(110, 150); + this.numericUpDown10.Maximum = new decimal(new int[] { + 255, + 0, + 0, + 0}); + this.numericUpDown10.Minimum = new decimal(new int[] { + 1, + 0, + 0, + 0}); + this.numericUpDown10.Name = "numericUpDown10"; + this.numericUpDown10.Size = new System.Drawing.Size(46, 20); + this.numericUpDown10.TabIndex = 26; + this.numericUpDown10.Value = new decimal(new int[] { + 1, + 0, + 0, + 0}); + // + // numericUpDown11 + // + this.numericUpDown11.Location = new System.Drawing.Point(58, 150); + this.numericUpDown11.Maximum = new decimal(new int[] { + 255, + 0, + 0, + 0}); + this.numericUpDown11.Minimum = new decimal(new int[] { + 1, + 0, + 0, + 0}); + this.numericUpDown11.Name = "numericUpDown11"; + this.numericUpDown11.Size = new System.Drawing.Size(46, 20); + this.numericUpDown11.TabIndex = 25; + this.numericUpDown11.Value = new decimal(new int[] { + 1, + 0, + 0, + 0}); + // + // numericUpDown12 + // + this.numericUpDown12.Location = new System.Drawing.Point(6, 150); + this.numericUpDown12.Maximum = new decimal(new int[] { + 255, + 0, + 0, + 0}); + this.numericUpDown12.Minimum = new decimal(new int[] { + 1, + 0, + 0, + 0}); + this.numericUpDown12.Name = "numericUpDown12"; + this.numericUpDown12.Size = new System.Drawing.Size(46, 20); + this.numericUpDown12.TabIndex = 24; + this.numericUpDown12.Value = new decimal(new int[] { + 1, + 0, + 0, + 0}); + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(6, 134); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(43, 13); + this.label3.TabIndex = 23; + this.label3.Text = "Getway"; // // frmMain // @@ -1485,11 +1887,26 @@ this.grpSerial.ResumeLayout(false); this.grpParallel.ResumeLayout(false); this.groupBox16.ResumeLayout(false); + this.tabNetwork.ResumeLayout(false); this.tabPaths.ResumeLayout(false); this.groupBox2.ResumeLayout(false); this.groupBox2.PerformLayout(); this.tabAbout.ResumeLayout(false); this.tabAbout.PerformLayout(); + this.groupBox3.ResumeLayout(false); + this.groupBox3.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown6)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown7)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown8)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown9)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown10)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown11)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown12)).EndInit(); this.ResumeLayout(false); }

1 0

[janderwald] 22497: * fix idl build command * generate client/server headers/sources in intermediate directory
by janderwald＠svn.reactos.org 22 Jun '06

22 Jun '06

Author: janderwald Date: Thu Jun 22 16:00:51 2006 New Revision: 22497 URL: http://svn.reactos.ru/svn/reactos?rev=22497&view=rev Log: * fix idl build command * generate client/server headers/sources in intermediate directory Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/v… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Thu Jun 22 16:00:51 2006 @@ -516,8 +516,9 @@ fprintf ( OUT, "\t\t\t\t\t<Tool\r\n" ); if (source_file.find(".idl") != string::npos) { - fprintf ( OUT, "\t\t\t\t\t\tName=\"VCCustomBuildTool\"\r\n" ); - fprintf ( OUT, "\t\t\t\t\t\tOutputs=\"$(OutDir)\\$(InputName).obj\"/>\r\n" ); + fprintf ( OUT, "\t\t\t\t\t\tName=\"VCMIDLTool\"\r\n" ); + fprintf ( OUT, "\t\t\t\t\t\tHeaderFileName=\"$(InputName).h\"\r\n" ); + fprintf ( OUT, "\t\t\t\t\t\tOutputDirectory=\"$(IntDir)\"/>\r\n" ); } else if ((source_file.find(".asm") != string::npos || tolower(source_file.at(source_file.size() - 1)) == 's')) {

1 0

[greatlrd] 22496: redesign the StartProces error handling so it does not freze the gui when it start a new process. this will slov vdk freze bug.
by greatlrd＠svn.reactos.org 22 Jun '06

22 Jun '06

Author: greatlrd Date: Thu Jun 22 15:39:08 2006 New Revision: 22496 URL: http://svn.reactos.ru/svn/reactos?rev=22496&view=rev Log: redesign the StartProces error handling so it does not freze the gui when it start a new process. this will slov vdk freze bug. Modified: trunk/tools/Qemu GUI/QEmu.cs trunk/tools/Qemu GUI/bin/Release/Qemu GUI.exe Modified: trunk/tools/Qemu GUI/QEmu.cs URL: http://svn.reactos.ru/svn/reactos/trunk/tools/Qemu%20GUI/QEmu.cs?rev=22496&… ============================================================================== --- trunk/tools/Qemu GUI/QEmu.cs (original) +++ trunk/tools/Qemu GUI/QEmu.cs Thu Jun 22 15:39:08 2006 @@ -59,12 +59,14 @@ p.StartInfo.RedirectStandardError = true; p.StartInfo.UseShellExecute = false; p.StartInfo.CreateNoWindow = true; + p.EnableRaisingEvents = true; + p.Exited += new EventHandler(mytask_output); try { p.Start(); - m_LastError = p.StandardError.ReadToEnd(); - if (m_LastError.Length > 0) - return false; + //m_LastError = p.StandardError.ReadToEnd(); + //if (m_LastError.Length > 0) + // return false; } catch { @@ -90,12 +92,14 @@ p.StartInfo.RedirectStandardOutput = true; p.StartInfo.UseShellExecute = false; p.StartInfo.CreateNoWindow = true; + p.EnableRaisingEvents = true; + p.Exited += new EventHandler(mytask_output); try { p.Start(); - m_LastError = p.StandardOutput.ReadToEnd(); - if (m_LastError.Length > 0) - return false; + //m_LastError = p.StandardOutput.ReadToEnd(); + //if (m_LastError.Length > 0) + // return false; } catch { @@ -114,12 +118,16 @@ p.StartInfo.RedirectStandardError = true; p.StartInfo.UseShellExecute = false; p.StartInfo.CreateNoWindow = true; + + p.EnableRaisingEvents = true; + p.Exited += new EventHandler(mytask_output); + try { p.Start(); - m_LastError = p.StandardError.ReadToEnd(); - if (m_LastError.Length > 0) - return false; + //m_LastError = p.StandardError.ReadToEnd(); + //if (m_LastError.Length > 0) + // return false; } catch { @@ -165,14 +173,18 @@ p.StartInfo.Arguments = GetArgv(); p.StartInfo.RedirectStandardError = true; p.StartInfo.UseShellExecute = false; - p.StartInfo.CreateNoWindow = true; - + p.StartInfo.CreateNoWindow = true; + + p.EnableRaisingEvents = true; + p.Exited += new EventHandler(mytask_output); + + try { p.Start(); - m_LastError = p.StandardError.ReadToEnd(); - if (m_LastError.Length > 0) - return false; + // m_LastError = p.StandardError.ReadLine(); + // if (m_LastError.Length > 0) + // return false; } catch { @@ -180,6 +192,12 @@ return false; } return true; + } + + private void mytask_output(object sender, EventArgs e) + { + Process ps = (Process)sender; + // add error handling here and do not freze the gui } [XmlElement("Misc")] @@ -253,6 +271,8 @@ } } + + public class Harddisks { Modified: trunk/tools/Qemu GUI/bin/Release/Qemu GUI.exe URL: http://svn.reactos.ru/svn/reactos/trunk/tools/Qemu%20GUI/bin/Release/Qemu%2… ============================================================================== Binary files - no diff available.

1 0

[ion] 22495: - Sorry... was suffering from post-REcon-where-the-frell-am-I disorder.
by ion＠svn.reactos.org 22 Jun '06

22 Jun '06

Author: ion Date: Thu Jun 22 07:08:09 2006 New Revision: 22495 URL: http://svn.reactos.ru/svn/reactos?rev=22495&view=rev Log: - Sorry... was suffering from post-REcon-where-the-frell-am-I disorder. Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?re… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rbuild Thu Jun 22 07:08:09 2006 @@ -272,9 +272,9 @@ <file>oblife.c</file> <file>obref.c</file> <file>sdcache.c</file> - <file>security.c</file> + <file>obsecure.c</file> <file>symlink.c</file> - <file>wait.c</file> + <file>obwait.c</file> </directory> <directory name="po"> <file>power.c</file>

1 0

[ion] 22494: - Rename obwait/obsecure - Check for valid access in NtSignalAndWaitForSingleObject and don't check if ResultLength isn't NULL in NtQueryObject, because it's not optional. - Add Thomas's name to a file where it wasn't. - Reformatting (only code change is #2 above)
by ion＠svn.reactos.org 22 Jun '06

22 Jun '06

Author: ion Date: Thu Jun 22 06:20:34 2006 New Revision: 22494 URL: http://svn.reactos.ru/svn/reactos?rev=22494&view=rev Log: - Rename obwait/obsecure - Check for valid access in NtSignalAndWaitForSingleObject and don't check if ResultLength isn't NULL in NtQueryObject, because it's not optional. - Add Thomas's name to a file where it wasn't. - Reformatting (only code change is #2 above) Added: trunk/reactos/ntoskrnl/ob/obsecure.c - copied, changed from r22345, trunk/reactos/ntoskrnl/ob/security.c trunk/reactos/ntoskrnl/ob/obwait.c - copied, changed from r22345, trunk/reactos/ntoskrnl/ob/wait.c Removed: trunk/reactos/ntoskrnl/ob/security.c trunk/reactos/ntoskrnl/ob/wait.c Copied: trunk/reactos/ntoskrnl/ob/obsecure.c (from r22345, trunk/reactos/ntoskrnl/ob/security.c) URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/obsecure.c?p2=t… ============================================================================== --- trunk/reactos/ntoskrnl/ob/security.c (original) +++ trunk/reactos/ntoskrnl/ob/obsecure.c Thu Jun 22 06:20:34 2006 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Kernel * LICENSE: GPL - See COPYING in the top level directory -* FILE: ntoskrnl/ob/security.c +* FILE: ntoskrnl/ob/obsecure.c * PURPOSE: SRM Interface of the Object Manager * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) * Eric Kohl @@ -12,6 +12,8 @@ #include <ntoskrnl.h> #define NDEBUG #include <internal/debug.h> + +#define TAG_SEC_QUERY TAG('O', 'b', 'S', 'q') /* FUNCTIONS ***************************************************************/ @@ -144,7 +146,7 @@ /* Allocate security descriptor */ *SecurityDescriptor = ExAllocatePoolWithTag(PagedPool, Length, - TAG('O', 'b', 'S', 'q')); + TAG_SEC_QUERY); if (!(*SecurityDescriptor)) return STATUS_INSUFFICIENT_RESOURCES; /* Query security descriptor */ @@ -248,72 +250,75 @@ KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); PVOID Object; POBJECT_HEADER Header; - ACCESS_MASK DesiredAccess = (ACCESS_MASK)0; + POBJECT_TYPE Type; + ACCESS_MASK DesiredAccess; NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); + /* Check if we came from user mode */ if (PreviousMode != KernelMode) { + /* Enter SEH */ _SEH_TRY { + /* Probe the SD and the length pointer */ ProbeForWrite(SecurityDescriptor, Length, sizeof(ULONG)); - if (ResultLength != NULL) - { ProbeForWriteUlong(ResultLength); - } } _SEH_HANDLE { + /* Get the exception code */ Status = _SEH_GetExceptionCode(); } _SEH_END; + /* Fail if we got an access violation */ if (!NT_SUCCESS(Status)) return Status; } - /* get the required access rights for the operation */ - SeQuerySecurityAccessMask(SecurityInformation, - &DesiredAccess); - + /* Get the required access rights for the operation */ + SeQuerySecurityAccessMask(SecurityInformation, &DesiredAccess); + + /* Reference the object */ Status = ObReferenceObjectByHandle(Handle, DesiredAccess, NULL, PreviousMode, &Object, NULL); - - if (NT_SUCCESS(Status)) - { - Header = OBJECT_TO_OBJECT_HEADER(Object); - ASSERT(Header->Type != NULL); - - Status = Header->Type->TypeInfo.SecurityProcedure( - Object, - QuerySecurityDescriptor, - SecurityInformation, - SecurityDescriptor, - &Length, - &Header->SecurityDescriptor, - Header->Type->TypeInfo.PoolType, - &Header->Type->TypeInfo.GenericMapping); - - ObDereferenceObject(Object); - - /* return the required length */ - if (ResultLength != NULL) - { - _SEH_TRY - { - *ResultLength = Length; - } - _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - } - } - + if (!NT_SUCCESS(Status)) return Status; + + /* Get the Object Header and Type */ + Header = OBJECT_TO_OBJECT_HEADER(Object); + Type = Header->Type; + + /* Call the security procedure's query function */ + Status = Type->TypeInfo.SecurityProcedure(Object, + QuerySecurityDescriptor, + SecurityInformation, + SecurityDescriptor, + &Length, + &Header->SecurityDescriptor, + Type->TypeInfo.PoolType, + &Type->TypeInfo.GenericMapping); + + /* Dereference the object */ + ObDereferenceObject(Object); + + /* Protect write with SEH */ + _SEH_TRY + { + /* Return the needed length */ + *ResultLength = Length; + } + _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) + { + /* Get the exception code */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + /* Return status */ return Status; } @@ -346,75 +351,140 @@ KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); PVOID Object; POBJECT_HEADER Header; - SECURITY_DESCRIPTOR_RELATIVE *CapturedSecurityDescriptor; - ACCESS_MASK DesiredAccess = (ACCESS_MASK)0; + POBJECT_TYPE Type; + SECURITY_DESCRIPTOR_RELATIVE *CapturedDescriptor; + ACCESS_MASK DesiredAccess; NTSTATUS Status; PAGED_CODE(); - /* make sure the caller doesn't pass a NULL security descriptor! */ - if (SecurityDescriptor == NULL) return STATUS_ACCESS_DENIED; - - /* capture and make a copy of the security descriptor */ + /* Make sure the caller doesn't pass a NULL security descriptor! */ + if (!SecurityDescriptor) return STATUS_ACCESS_VIOLATION; + + /* Capture and make a copy of the security descriptor */ Status = SeCaptureSecurityDescriptor(SecurityDescriptor, PreviousMode, PagedPool, TRUE, (PSECURITY_DESCRIPTOR*) - &CapturedSecurityDescriptor); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Capturing the security descriptor failed! Status: 0x%lx\n", Status); - return Status; - } + &CapturedDescriptor); + if (!NT_SUCCESS(Status)) return Status; /* - * make sure the security descriptor passed by the caller + * Make sure the security descriptor passed by the caller * is valid for the operation we're about to perform */ if (((SecurityInformation & OWNER_SECURITY_INFORMATION) && - (CapturedSecurityDescriptor->Owner == 0)) || + !(CapturedDescriptor->Owner)) || ((SecurityInformation & GROUP_SECURITY_INFORMATION) && - (CapturedSecurityDescriptor->Group == 0))) - { + !(CapturedDescriptor->Group))) + { + /* Set the failure status */ Status = STATUS_INVALID_SECURITY_DESCR; } else { - /* get the required access rights for the operation */ - SeSetSecurityAccessMask(SecurityInformation, - &DesiredAccess); - + /* Set the required access rights for the operation */ + SeSetSecurityAccessMask(SecurityInformation, &DesiredAccess); + + /* Reference the object */ Status = ObReferenceObjectByHandle(Handle, DesiredAccess, NULL, PreviousMode, &Object, NULL); - if (NT_SUCCESS(Status)) { + /* Get the Object Header and Type */ Header = OBJECT_TO_OBJECT_HEADER(Object); - ASSERT(Header->Type != NULL); - - Status = Header->Type->TypeInfo.SecurityProcedure( - Object, - SetSecurityDescriptor, - SecurityInformation, - (PSECURITY_DESCRIPTOR)SecurityDescriptor, - NULL, - &Header->SecurityDescriptor, - Header->Type->TypeInfo.PoolType, - &Header->Type->TypeInfo.GenericMapping); - + Type = Header->Type; + + /* Call the security procedure's set function */ + Status = Type->TypeInfo.SecurityProcedure(Object, + SetSecurityDescriptor, + SecurityInformation, + SecurityDescriptor, + NULL, + &Header-> + SecurityDescriptor, + Type->TypeInfo.PoolType, + &Type-> + TypeInfo.GenericMapping); + + /* Now we can dereference the object */ ObDereferenceObject(Object); } } - /* release the descriptor */ - SeReleaseSecurityDescriptor((PSECURITY_DESCRIPTOR)CapturedSecurityDescriptor, + /* Release the descriptor and return status */ + SeReleaseSecurityDescriptor((PSECURITY_DESCRIPTOR)CapturedDescriptor, PreviousMode, TRUE); - + return Status; +} + +/*++ +* @name ObQueryObjectAuditingByHandle +* @implemented NT5 +* +* The ObDereferenceSecurityDescriptor routine <FILLMEIN> +* +* @param SecurityDescriptor +* <FILLMEIN> +* +* @param Count +* <FILLMEIN> +* +* @return STATUS_SUCCESS or appropriate error value. +* +* @remarks None. +* +*--*/ +NTSTATUS +NTAPI +ObQueryObjectAuditingByHandle(IN HANDLE Handle, + OUT PBOOLEAN GenerateOnClose) +{ + PHANDLE_TABLE_ENTRY HandleEntry; + PVOID HandleTable; + NTSTATUS Status = STATUS_SUCCESS; + PAGED_CODE(); + + /* Check if we're dealing with a kernel handle */ + if (ObIsKernelHandle(Handle, ExGetPreviousMode())) + { + /* Use the kernel table and convert the handle */ + HandleTable = ObpKernelHandleTable; + Handle = ObKernelHandleToHandle(Handle); + } + else + { + /* Use the process's handle table */ + HandleTable = PsGetCurrentProcess()->ObjectTable; + } + + /* Enter a critical region while we touch the handle table */ + KeEnterCriticalRegion(); + + /* Map the handle */ + HandleEntry = ExMapHandleToPointer(HandleTable, Handle); + if(HandleEntry) + { + /* Check if the flag is set */ + *GenerateOnClose = (HandleEntry->ObAttributes & + EX_HANDLE_ENTRY_AUDITONCLOSE) != 0; + + /* Unlock the entry */ + ExUnlockHandleTableEntry(HandleTable, HandleEntry); + } + else + { + /* Otherwise, fail */ + Status = STATUS_INVALID_HANDLE; + } + + /* Leave the critical region and return the status */ + KeLeaveCriticalRegion(); return Status; } @@ -480,69 +550,4 @@ DPRINT1("ObDereferenceSecurityDescriptor is not implemented!\n"); } -/*++ -* @name ObQueryObjectAuditingByHandle -* @implemented NT5 -* -* The ObDereferenceSecurityDescriptor routine <FILLMEIN> -* -* @param SecurityDescriptor -* <FILLMEIN> -* -* @param Count -* <FILLMEIN> -* -* @return STATUS_SUCCESS or appropriate error value. -* -* @remarks None. -* -*--*/ -NTSTATUS -NTAPI -ObQueryObjectAuditingByHandle(IN HANDLE Handle, - OUT PBOOLEAN GenerateOnClose) -{ - PHANDLE_TABLE_ENTRY HandleEntry; - PVOID HandleTable; - NTSTATUS Status = STATUS_SUCCESS; - PAGED_CODE(); - - /* Check if we're dealing with a kernel handle */ - if (ObIsKernelHandle(Handle, ExGetPreviousMode())) - { - /* Use the kernel table and convert the handle */ - HandleTable = ObpKernelHandleTable; - Handle = ObKernelHandleToHandle(Handle); - } - else - { - /* Use the process's handle table */ - HandleTable = PsGetCurrentProcess()->ObjectTable; - } - - /* Enter a critical region while we touch the handle table */ - KeEnterCriticalRegion(); - - /* Map the handle */ - HandleEntry = ExMapHandleToPointer(HandleTable, Handle); - if(HandleEntry) - { - /* Check if the flag is set */ - *GenerateOnClose = (HandleEntry->ObAttributes & - EX_HANDLE_ENTRY_AUDITONCLOSE) != 0; - - /* Unlock the entry */ - ExUnlockHandleTableEntry(HandleTable, HandleEntry); - } - else - { - /* Otherwise, fail */ - Status = STATUS_INVALID_HANDLE; - } - - /* Leave the critical region and return the status */ - KeLeaveCriticalRegion(); - return Status; -} - /* EOF */ Copied: trunk/reactos/ntoskrnl/ob/obwait.c (from r22345, trunk/reactos/ntoskrnl/ob/wait.c) URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/obwait.c?p2=tru… ============================================================================== --- trunk/reactos/ntoskrnl/ob/wait.c (original) +++ trunk/reactos/ntoskrnl/ob/obwait.c Thu Jun 22 06:20:34 2006 @@ -1,10 +1,10 @@ /* * PROJECT: ReactOS Kernel * LICENSE: GPL - See COPYING in the top level directory - * FILE: ntoskrnl/ob/wait.c + * FILE: ntoskrnl/ob/obwait.c * PURPOSE: Handles Waiting on Objects * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) - * David Welch (welch(a)mcmail.com) + * Thomas Weidenmueller (w3seek(a)reactos.org) */ /* INCLUDES ******************************************************************/ @@ -65,7 +65,6 @@ ACCESS_MASK GrantedAccess; PVOID DefaultObject; NTSTATUS Status = STATUS_SUCCESS; - DPRINT("NtWaitForMultipleObjects(ObjectCount %lu HandleArray[] %x," " Alertable %d, TimeOut %x)\n", ObjectCount, HandleArray, Alertable, TimeOut); @@ -78,7 +77,6 @@ if ((ObjectCount > MAXIMUM_WAIT_OBJECTS) || !ObjectCount) { Status = STATUS_INVALID_PARAMETER_1; - DPRINT1("No object count, or too many objects\n"); goto Quickie; } @@ -86,20 +84,20 @@ if ((WaitType != WaitAll) && (WaitType != WaitAny)) { Status = STATUS_INVALID_PARAMETER_3; - DPRINT1("Invalid wait type\n"); goto Quickie; } - /* Capture arguments */ + /* Enter SEH */ _SEH_TRY { + /* Check if the call came from user mode */ if(PreviousMode != KernelMode) { + /* Probe all the handles */ ProbeForRead(HandleArray, ObjectCount * sizeof(HANDLE), sizeof(HANDLE)); - - if(TimeOut) + if (TimeOut) { /* Make a local copy of the timeout on the stack */ SafeTimeOut = ProbeForReadLargeInteger(TimeOut); @@ -118,18 +116,21 @@ } _SEH_HANDLE { + /* Get exception code */ Status = _SEH_GetExceptionCode(); } _SEH_END; - if(!NT_SUCCESS(Status)) goto Quickie; + /* Fail if we raised an exception */ + if (!NT_SUCCESS(Status)) goto Quickie; /* Check if we can use the internal Wait Array */ if (ObjectCount > THREAD_WAIT_OBJECTS) { /* Allocate from Pool */ WaitBlockArray = ExAllocatePoolWithTag(NonPagedPool, - ObjectCount * sizeof(KWAIT_BLOCK), + ObjectCount * + sizeof(KWAIT_BLOCK), TAG_WAIT); } @@ -137,7 +138,7 @@ do { /* Use the right Executive Handle */ - if(ObIsKernelHandle(Handles[i], PreviousMode)) + if (ObIsKernelHandle(Handles[i], PreviousMode)) { /* Use the System Handle Table and decode */ HandleTable = ObpKernelHandleTable; @@ -164,7 +165,6 @@ /* Unlock the entry and fail */ ExUnlockHandleTableEntry(HandleTable, HandleEntry); Status = STATUS_ACCESS_DENIED; - DPRINT1("Handle doesn't have SYNCH access\n"); goto Quickie; } @@ -218,7 +218,6 @@ { /* Fail */ Status = STATUS_INVALID_PARAMETER_MIX; - DPRINT1("Objects duplicated with WaitAll\n"); goto Quickie; } } @@ -247,6 +246,7 @@ } _SEH_HANDLE { + /* Get the exception code */ Status = _SEH_GetExceptionCode(); } _SEH_END; @@ -255,9 +255,13 @@ /* First derefence */ while (ReferencedObjects) { + /* Decrease the number of objects */ ReferencedObjects--; + + /* Check if we had a valid object in this position */ if (Objects[ReferencedObjects]) { + /* Dereference it */ ObDereferenceObject(Objects[ReferencedObjects]); } } @@ -269,7 +273,6 @@ if (LockInUse) KeLeaveCriticalRegion(); /* Return status */ - DPRINT("Returning: %x\n", Status); return Status; } @@ -303,12 +306,11 @@ KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); LARGE_INTEGER SafeTimeOut; NTSTATUS Status = STATUS_SUCCESS; - DPRINT("NtWaitForSingleObject(ObjectHandle %x, Alertable %d, TimeOut %x)\n", ObjectHandle,Alertable,TimeOut); - /* Capture timeout */ - if(TimeOut && PreviousMode != KernelMode) + /* Check if we came with a timeout from user mode */ + if (TimeOut && PreviousMode != KernelMode) { _SEH_TRY { @@ -318,11 +320,13 @@ } _SEH_HANDLE { + /* Get the exception code */ Status = _SEH_GetExceptionCode(); } _SEH_END; - if(!NT_SUCCESS(Status)) return Status; + /* Fail if we got an access violation */ + if (!NT_SUCCESS(Status)) return Status; } /* Get the Object */ @@ -345,9 +349,10 @@ (ULONG_PTR)WaitableObject); } - /* Now wait. Also SEH this since it can also raise an exception */ + /* SEH this since it can also raise an exception */ _SEH_TRY { + /* Ask the kernel to do the wait */ Status = KeWaitForSingleObject(WaitableObject, UserRequest, PreviousMode, @@ -356,6 +361,7 @@ } _SEH_HANDLE { + /* Get the exception code */ Status = _SEH_GetExceptionCode(); } _SEH_END; @@ -407,9 +413,8 @@ OBJECT_HANDLE_INFORMATION HandleInfo; NTSTATUS Status = STATUS_SUCCESS; - /* Capture timeout */ - DPRINT("NtSignalAndWaitForSingleObject\n"); - if(TimeOut && PreviousMode != KernelMode) + /* Check if we came with a timeout from user mode */ + if (TimeOut && PreviousMode != KernelMode) { _SEH_TRY { @@ -419,11 +424,13 @@ } _SEH_HANDLE { + /* Get the exception code */ Status = _SEH_GetExceptionCode(); } _SEH_END; - if(!NT_SUCCESS(Status)) return Status; + /* Fail if we got an access violation */ + if (!NT_SUCCESS(Status)) return Status; } /* Start by getting the signal object*/ @@ -433,10 +440,7 @@ PreviousMode, &SignalObj, &HandleInfo); - if (!NT_SUCCESS(Status)) - { - return Status; - } + if (!NT_SUCCESS(Status)) return Status; /* Now get the wait object */ Status = ObReferenceObjectByHandle(WaitableObjectHandle, @@ -447,6 +451,7 @@ NULL); if (!NT_SUCCESS(Status)) { + /* Failed to reference the wait object */ ObDereferenceObject(SignalObj); return Status; } @@ -461,67 +466,88 @@ WaitableObject = (PVOID)((ULONG_PTR)WaitObj + (ULONG_PTR)WaitableObject); } - + /* Check Signal Object Type */ Type = OBJECT_TO_OBJECT_HEADER(WaitObj)->Type; if (Type == ExEventObjectType) { + /* Check if we came from user-mode without the right access */ + if ((PreviousMode != KernelMode) && + !(HandleInfo.GrantedAccess & EVENT_MODIFY_STATE)) + { + /* Fail: lack of rights */ + goto Quickie; + } + /* Set the Event */ - /* FIXME: Check permissions */ KeSetEvent(SignalObj, EVENT_INCREMENT, TRUE); } else if (Type == ExMutantObjectType) { - /* Release the Mutant. This can raise an exception*/ + /* This can raise an exception */ _SEH_TRY { + /* Release the mutant */ KeReleaseMutant(SignalObj, MUTANT_INCREMENT, FALSE, TRUE); } _SEH_HANDLE { + /* Get the exception code */ Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + else if (Type == ExSemaphoreObjectType) + { + /* Check if we came from user-mode without the right access */ + if ((PreviousMode != KernelMode) && + !(HandleInfo.GrantedAccess & SEMAPHORE_MODIFY_STATE)) + { + /* Fail: lack of rights */ goto Quickie; } + + /* This can raise an exception*/ + _SEH_TRY + { + /* Release the semaphore */ + KeReleaseSemaphore(SignalObj, SEMAPHORE_INCREMENT, 1, TRUE); + } + _SEH_HANDLE + { + /* Get the exception code */ + Status = _SEH_GetExceptionCode(); + } _SEH_END; } - else if (Type == ExSemaphoreObjectType) - { - /* Release the Semaphore. This can raise an exception*/ - /* FIXME: Check permissions */ + else + { + /* This isn't a valid object to be waiting on */ + Status = STATUS_OBJECT_TYPE_MISMATCH; + } + + /* Make sure we didn't fail */ + if (NT_SUCCESS(Status)) + { + /* SEH this since it can also raise an exception */ _SEH_TRY { - KeReleaseSemaphore(SignalObj, SEMAPHORE_INCREMENT, 1, TRUE); + /* Perform the wait now */ + Status = KeWaitForSingleObject(WaitableObject, + UserRequest, + PreviousMode, + Alertable, + TimeOut); } _SEH_HANDLE { + /* Get the exception code */ Status = _SEH_GetExceptionCode(); - goto Quickie; } _SEH_END; } - else - { - Status = STATUS_OBJECT_TYPE_MISMATCH; - DPRINT1("Waiting on invalid object type\n"); - goto Quickie; - } - - /* Now wait. Also SEH this since it can also raise an exception */ - _SEH_TRY - { - Status = KeWaitForSingleObject(WaitableObject, - UserRequest, - PreviousMode, - Alertable, - TimeOut); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - /* We're done here */ + + /* We're done here, dereference both objects */ Quickie: ObDereferenceObject(SignalObj); ObDereferenceObject(WaitObj); Removed: trunk/reactos/ntoskrnl/ob/security.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/security.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ob/security.c (original) +++ trunk/reactos/ntoskrnl/ob/security.c (removed) @@ -1,548 +1,0 @@ -/* -* PROJECT: ReactOS Kernel -* LICENSE: GPL - See COPYING in the top level directory -* FILE: ntoskrnl/ob/security.c -* PURPOSE: SRM Interface of the Object Manager -* PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) -* Eric Kohl -*/ - -/* INCLUDES *****************************************************************/ - -#include <ntoskrnl.h> -#define NDEBUG -#include <internal/debug.h> - -/* FUNCTIONS ***************************************************************/ - -/*++ -* @name ObAssignSecurity -* @implemented NT4 -* -* The ObAssignSecurity routine <FILLMEIN> -* -* @param AccessState -* <FILLMEIN> -* -* @param SecurityDescriptor -* <FILLMEIN> -* -* @param Object -* <FILLMEIN> -* -* @param Type -* <FILLMEIN> -* -* @return STATUS_SUCCESS or appropriate error value. -* -* @remarks None. -* -*--*/ -NTSTATUS -NTAPI -ObAssignSecurity(IN PACCESS_STATE AccessState, - IN PSECURITY_DESCRIPTOR SecurityDescriptor, - IN PVOID Object, - IN POBJECT_TYPE Type) -{ - PSECURITY_DESCRIPTOR NewDescriptor; - NTSTATUS Status; - PAGED_CODE(); - - /* Build the new security descriptor */ - Status = SeAssignSecurity(SecurityDescriptor, - AccessState->SecurityDescriptor, - &NewDescriptor, - (Type == ObDirectoryType), - &AccessState->SubjectSecurityContext, - &Type->TypeInfo.GenericMapping, - PagedPool); - if (!NT_SUCCESS(Status)) return Status; - - /* Call the security method */ - Status = Type->TypeInfo.SecurityProcedure(Object, - AssignSecurityDescriptor, - 0, - NewDescriptor, - NULL, - NULL, - PagedPool, - &Type->TypeInfo.GenericMapping); - if (!NT_SUCCESS(Status)) - { - /* Release the new security descriptor */ - SeDeassignSecurity(&NewDescriptor); - } - - /* Return to caller */ - return Status; -} - -/*++ -* @name ObGetObjectSecurity -* @implemented NT4 -* -* The ObGetObjectSecurity routine <FILLMEIN> -* -* @param Object -* <FILLMEIN> -* -* @param SecurityDescriptor -* <FILLMEIN> -* -* @param MemoryAllocated -* <FILLMEIN> -* -* @return STATUS_SUCCESS or appropriate error value. -* -* @remarks None. -* -*--*/ -NTSTATUS -NTAPI -ObGetObjectSecurity(IN PVOID Object, - OUT PSECURITY_DESCRIPTOR *SecurityDescriptor, - OUT PBOOLEAN MemoryAllocated) -{ - POBJECT_HEADER Header; - POBJECT_TYPE Type; - ULONG Length; - NTSTATUS Status; - PAGED_CODE(); - - /* Get the object header and type */ - Header = OBJECT_TO_OBJECT_HEADER(Object); - Type = Header->Type; - - /* Check if the object uses default security */ - if (Type->TypeInfo.SecurityProcedure == SeDefaultObjectMethod) - { - /* Reference the descriptor */ - *SecurityDescriptor = - ObpReferenceCachedSecurityDescriptor(Header->SecurityDescriptor); - - /* Tell the caller that we didn't have to allocate anything */ - *MemoryAllocated = FALSE; - return STATUS_SUCCESS; - } - - /* Get the security descriptor size */ - Length = 0; - Status = Type->TypeInfo.SecurityProcedure(Object, - QuerySecurityDescriptor, - OWNER_SECURITY_INFORMATION | - GROUP_SECURITY_INFORMATION | - DACL_SECURITY_INFORMATION | - SACL_SECURITY_INFORMATION, - *SecurityDescriptor, - &Length, - &Header->SecurityDescriptor, - Type->TypeInfo.PoolType, - &Type->TypeInfo.GenericMapping); - if (Status != STATUS_BUFFER_TOO_SMALL) return Status; - - /* Allocate security descriptor */ - *SecurityDescriptor = ExAllocatePoolWithTag(PagedPool, - Length, - TAG('O', 'b', 'S', 'q')); - if (!(*SecurityDescriptor)) return STATUS_INSUFFICIENT_RESOURCES; - - /* Query security descriptor */ - *MemoryAllocated = TRUE; - Status = Type->TypeInfo.SecurityProcedure(Object, - QuerySecurityDescriptor, - OWNER_SECURITY_INFORMATION | - GROUP_SECURITY_INFORMATION | - DACL_SECURITY_INFORMATION | - SACL_SECURITY_INFORMATION, - *SecurityDescriptor, - &Length, - &Header->SecurityDescriptor, - Type->TypeInfo.PoolType, - &Type->TypeInfo.GenericMapping); - if (!NT_SUCCESS(Status)) - { - /* Free the descriptor and tell the caller we failed */ - ExFreePool(*SecurityDescriptor); - *MemoryAllocated = FALSE; - } - - /* Return status */ - return Status; -} - -/*++ -* @name ObReleaseObjectSecurity -* @implemented NT4 -* -* The ObReleaseObjectSecurity routine <FILLMEIN> -* -* @param SecurityDescriptor -* <FILLMEIN> -* -* @param MemoryAllocated -* <FILLMEIN> -* -* @return STATUS_SUCCESS or appropriate error value. -* -* @remarks None. -* -*--*/ -VOID -NTAPI -ObReleaseObjectSecurity(IN PSECURITY_DESCRIPTOR SecurityDescriptor, - IN BOOLEAN MemoryAllocated) -{ - PAGED_CODE(); - - /* Nothing to do in this case */ - if (!SecurityDescriptor) return; - - /* Check if we had allocated it from memory */ - if (MemoryAllocated) - { - /* Free it */ - ExFreePool(SecurityDescriptor); - } - else - { - /* Otherwise this means we used an internal descriptor */ - ObpDereferenceCachedSecurityDescriptor(SecurityDescriptor); - } -} - -/*++ -* @name NtQuerySecurityObject -* @implemented NT4 -* -* The NtQuerySecurityObject routine <FILLMEIN> -* -* @param Handle -* <FILLMEIN> -* -* @param SecurityInformation -* <FILLMEIN> -* -* @param SecurityDescriptor -* <FILLMEIN> -* -* @param Length -* <FILLMEIN> -* -* @param ResultLength -* <FILLMEIN> -* -* @return STATUS_SUCCESS or appropriate error value. -* -* @remarks None. -* -*--*/ -NTSTATUS -NTAPI -NtQuerySecurityObject(IN HANDLE Handle, - IN SECURITY_INFORMATION SecurityInformation, - OUT PSECURITY_DESCRIPTOR SecurityDescriptor, - IN ULONG Length, - OUT PULONG ResultLength) -{ - KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - PVOID Object; - POBJECT_HEADER Header; - ACCESS_MASK DesiredAccess = (ACCESS_MASK)0; - NTSTATUS Status = STATUS_SUCCESS; - PAGED_CODE(); - - if (PreviousMode != KernelMode) - { - _SEH_TRY - { - ProbeForWrite(SecurityDescriptor, Length, sizeof(ULONG)); - if (ResultLength != NULL) - { - ProbeForWriteUlong(ResultLength); - } - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if (!NT_SUCCESS(Status)) return Status; - } - - /* get the required access rights for the operation */ - SeQuerySecurityAccessMask(SecurityInformation, - &DesiredAccess); - - Status = ObReferenceObjectByHandle(Handle, - DesiredAccess, - NULL, - PreviousMode, - &Object, - NULL); - - if (NT_SUCCESS(Status)) - { - Header = OBJECT_TO_OBJECT_HEADER(Object); - ASSERT(Header->Type != NULL); - - Status = Header->Type->TypeInfo.SecurityProcedure( - Object, - QuerySecurityDescriptor, - SecurityInformation, - SecurityDescriptor, - &Length, - &Header->SecurityDescriptor, - Header->Type->TypeInfo.PoolType, - &Header->Type->TypeInfo.GenericMapping); - - ObDereferenceObject(Object); - - /* return the required length */ - if (ResultLength != NULL) - { - _SEH_TRY - { - *ResultLength = Length; - } - _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - } - } - - return Status; -} - -/*++ -* @name NtSetSecurityObject -* @implemented NT4 -* -* The NtSetSecurityObject routine <FILLMEIN> -* -* @param Handle -* <FILLMEIN> -* -* @param SecurityInformation -* <FILLMEIN> -* -* @param SecurityDescriptor -* <FILLMEIN> -* -* @return STATUS_SUCCESS or appropriate error value. -* -* @remarks None. -* -*--*/ -NTSTATUS -NTAPI -NtSetSecurityObject(IN HANDLE Handle, - IN SECURITY_INFORMATION SecurityInformation, - IN PSECURITY_DESCRIPTOR SecurityDescriptor) -{ - KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - PVOID Object; - POBJECT_HEADER Header; - SECURITY_DESCRIPTOR_RELATIVE *CapturedSecurityDescriptor; - ACCESS_MASK DesiredAccess = (ACCESS_MASK)0; - NTSTATUS Status; - PAGED_CODE(); - - /* make sure the caller doesn't pass a NULL security descriptor! */ - if (SecurityDescriptor == NULL) return STATUS_ACCESS_DENIED; - - /* capture and make a copy of the security descriptor */ - Status = SeCaptureSecurityDescriptor(SecurityDescriptor, - PreviousMode, - PagedPool, - TRUE, - (PSECURITY_DESCRIPTOR*) - &CapturedSecurityDescriptor); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Capturing the security descriptor failed! Status: 0x%lx\n", Status); - return Status; - } - - /* - * make sure the security descriptor passed by the caller - * is valid for the operation we're about to perform - */ - if (((SecurityInformation & OWNER_SECURITY_INFORMATION) && - (CapturedSecurityDescriptor->Owner == 0)) || - ((SecurityInformation & GROUP_SECURITY_INFORMATION) && - (CapturedSecurityDescriptor->Group == 0))) - { - Status = STATUS_INVALID_SECURITY_DESCR; - } - else - { - /* get the required access rights for the operation */ - SeSetSecurityAccessMask(SecurityInformation, - &DesiredAccess); - - Status = ObReferenceObjectByHandle(Handle, - DesiredAccess, - NULL, - PreviousMode, - &Object, - NULL); - - if (NT_SUCCESS(Status)) - { - Header = OBJECT_TO_OBJECT_HEADER(Object); - ASSERT(Header->Type != NULL); - - Status = Header->Type->TypeInfo.SecurityProcedure( - Object, - SetSecurityDescriptor, - SecurityInformation, - (PSECURITY_DESCRIPTOR)SecurityDescriptor, - NULL, - &Header->SecurityDescriptor, - Header->Type->TypeInfo.PoolType, - &Header->Type->TypeInfo.GenericMapping); - - ObDereferenceObject(Object); - } - } - - /* release the descriptor */ - SeReleaseSecurityDescriptor((PSECURITY_DESCRIPTOR)CapturedSecurityDescriptor, - PreviousMode, - TRUE); - - return Status; -} - -/*++ -* @name ObLogSecurityDescriptor -* @unimplemented NT5.2 -* -* The ObLogSecurityDescriptor routine <FILLMEIN> -* -* @param InputSecurityDescriptor -* <FILLMEIN> -* -* @param OutputSecurityDescriptor -* <FILLMEIN> -* -* @param RefBias -* <FILLMEIN> -* -* @return STATUS_SUCCESS or appropriate error value. -* -* @remarks None. -* -*--*/ -NTSTATUS -NTAPI -ObLogSecurityDescriptor(IN PSECURITY_DESCRIPTOR InputSecurityDescriptor, - OUT PSECURITY_DESCRIPTOR *OutputSecurityDescriptor, - IN ULONG RefBias) -{ - /* HACK: Return the same descriptor back */ - PISECURITY_DESCRIPTOR SdCopy; - DPRINT1("ObLogSecurityDescriptor is not implemented!\n", - InputSecurityDescriptor); - - SdCopy = ExAllocatePool(PagedPool, sizeof(*SdCopy)); - RtlMoveMemory(SdCopy, InputSecurityDescriptor, sizeof(*SdCopy)); - *OutputSecurityDescriptor = SdCopy; - return STATUS_SUCCESS; -} - -/*++ -* @name ObDereferenceSecurityDescriptor -* @unimplemented NT5.2 -* -* The ObDereferenceSecurityDescriptor routine <FILLMEIN> -* -* @param SecurityDescriptor -* <FILLMEIN> -* -* @param Count -* <FILLMEIN> -* -* @return STATUS_SUCCESS or appropriate error value. -* -* @remarks None. -* -*--*/ -VOID -NTAPI -ObDereferenceSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptor, - IN ULONG Count) -{ - DPRINT1("ObDereferenceSecurityDescriptor is not implemented!\n"); -} - -/*++ -* @name ObQueryObjectAuditingByHandle -* @implemented NT5 -* -* The ObDereferenceSecurityDescriptor routine <FILLMEIN> -* -* @param SecurityDescriptor -* <FILLMEIN> -* -* @param Count -* <FILLMEIN> -* -* @return STATUS_SUCCESS or appropriate error value. -* -* @remarks None. -* -*--*/ -NTSTATUS -NTAPI -ObQueryObjectAuditingByHandle(IN HANDLE Handle, - OUT PBOOLEAN GenerateOnClose) -{ - PHANDLE_TABLE_ENTRY HandleEntry; - PVOID HandleTable; - NTSTATUS Status = STATUS_SUCCESS; - PAGED_CODE(); - - /* Check if we're dealing with a kernel handle */ - if (ObIsKernelHandle(Handle, ExGetPreviousMode())) - { - /* Use the kernel table and convert the handle */ - HandleTable = ObpKernelHandleTable; - Handle = ObKernelHandleToHandle(Handle); - } - else - { - /* Use the process's handle table */ - HandleTable = PsGetCurrentProcess()->ObjectTable; - } - - /* Enter a critical region while we touch the handle table */ - KeEnterCriticalRegion(); - - /* Map the handle */ - HandleEntry = ExMapHandleToPointer(HandleTable, Handle); - if(HandleEntry) - { - /* Check if the flag is set */ - *GenerateOnClose = (HandleEntry->ObAttributes & - EX_HANDLE_ENTRY_AUDITONCLOSE) != 0; - - /* Unlock the entry */ - ExUnlockHandleTableEntry(HandleTable, HandleEntry); - } - else - { - /* Otherwise, fail */ - Status = STATUS_INVALID_HANDLE; - } - - /* Leave the critical region and return the status */ - KeLeaveCriticalRegion(); - return Status; -} - -/* EOF */ Removed: trunk/reactos/ntoskrnl/ob/wait.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/wait.c?rev=2249… ============================================================================== --- trunk/reactos/ntoskrnl/ob/wait.c (original) +++ trunk/reactos/ntoskrnl/ob/wait.c (removed) @@ -1,531 +1,0 @@ -/* - * PROJECT: ReactOS Kernel - * LICENSE: GPL - See COPYING in the top level directory - * FILE: ntoskrnl/ob/wait.c - * PURPOSE: Handles Waiting on Objects - * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) - * David Welch (welch(a)mcmail.com) - */ - -/* INCLUDES ******************************************************************/ - -#include <ntoskrnl.h> -#define NDEBUG -#include <internal/debug.h> - -#define TAG_WAIT TAG('W', 'a', 'i', 't') - -/* FUNCTIONS *****************************************************************/ - -/*++ -* @name NtWaitForMultipleObjects -* @implemented NT4 -* -* The NtWaitForMultipleObjects routine <FILLMEIN> -* -* @param ObjectCount -* <FILLMEIN> -* -* @param HandleArray -* <FILLMEIN> -* -* @param WaitType -* <FILLMEIN> -* -* @param Alertable -* <FILLMEIN> -* -* @param TimeOut -* <FILLMEIN> -* -* @return STATUS_SUCCESS or appropriate error value. -* -* @remarks None. -* -*--*/ -NTSTATUS -NTAPI -NtWaitForMultipleObjects(IN ULONG ObjectCount, - IN PHANDLE HandleArray, - IN WAIT_TYPE WaitType, - IN BOOLEAN Alertable, - IN PLARGE_INTEGER TimeOut OPTIONAL) -{ - PKWAIT_BLOCK WaitBlockArray = NULL; - HANDLE Handles[MAXIMUM_WAIT_OBJECTS]; - PVOID Objects[MAXIMUM_WAIT_OBJECTS]; - PVOID WaitObjects[MAXIMUM_WAIT_OBJECTS]; - ULONG i = 0, ReferencedObjects = 0, j; - KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - LARGE_INTEGER SafeTimeOut; - BOOLEAN LockInUse; - PHANDLE_TABLE_ENTRY HandleEntry; - POBJECT_HEADER ObjectHeader; - PHANDLE_TABLE HandleTable; - ACCESS_MASK GrantedAccess; - PVOID DefaultObject; - NTSTATUS Status = STATUS_SUCCESS; - - DPRINT("NtWaitForMultipleObjects(ObjectCount %lu HandleArray[] %x," - " Alertable %d, TimeOut %x)\n", - ObjectCount, HandleArray, Alertable, TimeOut); - - /* Enter a critical region since we'll play with handles */ - LockInUse = TRUE; - KeEnterCriticalRegion(); - - /* Check for valid Object Count */ - if ((ObjectCount > MAXIMUM_WAIT_OBJECTS) || !ObjectCount) - { - Status = STATUS_INVALID_PARAMETER_1; - DPRINT1("No object count, or too many objects\n"); - goto Quickie; - } - - /* Check for valid Wait Type */ - if ((WaitType != WaitAll) && (WaitType != WaitAny)) - { - Status = STATUS_INVALID_PARAMETER_3; - DPRINT1("Invalid wait type\n"); - goto Quickie; - } - - /* Capture arguments */ - _SEH_TRY - { - if(PreviousMode != KernelMode) - { - ProbeForRead(HandleArray, - ObjectCount * sizeof(HANDLE), - sizeof(HANDLE)); - - if(TimeOut) - { - /* Make a local copy of the timeout on the stack */ - SafeTimeOut = ProbeForReadLargeInteger(TimeOut); - TimeOut = &SafeTimeOut; - } - } - - /* - * Make a copy so we don't have to guard with SEH later and keep - * track of what objects we referenced if dereferencing pointers - * suddenly fails - */ - RtlCopyMemory(Handles, - HandleArray, - ObjectCount * sizeof(HANDLE)); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if(!NT_SUCCESS(Status)) goto Quickie; - - /* Check if we can use the internal Wait Array */ - if (ObjectCount > THREAD_WAIT_OBJECTS) - { - /* Allocate from Pool */ - WaitBlockArray = ExAllocatePoolWithTag(NonPagedPool, - ObjectCount * sizeof(KWAIT_BLOCK), - TAG_WAIT); - } - - /* Start the loop */ - do - { - /* Use the right Executive Handle */ - if(ObIsKernelHandle(Handles[i], PreviousMode)) - { - /* Use the System Handle Table and decode */ - HandleTable = ObpKernelHandleTable; - Handles[i] = ObKernelHandleToHandle(Handles[i]); - } - else - { - /* Use the Process' Handle table and get the Ex Handle */ - HandleTable = PsGetCurrentProcess()->ObjectTable; - } - - /* Get a pointer to it */ - if (!(HandleEntry = ExMapHandleToPointer(HandleTable, Handles[i]))) - { - DPRINT1("Invalid handle\n"); - Status = STATUS_INVALID_HANDLE; - goto Quickie; - } - - /* Check for synchronize access */ - GrantedAccess = HandleEntry->GrantedAccess; - if ((PreviousMode != KernelMode) && (!(GrantedAccess & SYNCHRONIZE))) - { - /* Unlock the entry and fail */ - ExUnlockHandleTableEntry(HandleTable, HandleEntry); - Status = STATUS_ACCESS_DENIED; - DPRINT1("Handle doesn't have SYNCH access\n"); - goto Quickie; - } - - /* Get the Object Header */ - ObjectHeader = EX_HTE_TO_HDR(HandleEntry); - - /* Get default Object */ - DefaultObject = ObjectHeader->Type->DefaultObject; - - /* Check if it's the internal offset */ - if (IsPointerOffset(DefaultObject)) - { - /* Increase reference count */ - InterlockedIncrement(&ObjectHeader->PointerCount); - ReferencedObjects++; - - /* Save the Object and Wait Object, this is a relative offset */ - Objects[i] = &ObjectHeader->Body; - WaitObjects[i] = (PVOID)((ULONG_PTR)&ObjectHeader->Body + - (ULONG_PTR)DefaultObject); - } - else - { - /* This is our internal Object */ - ReferencedObjects++; - Objects[i] = NULL; - WaitObjects[i] = DefaultObject; - } - - /* Unlock the Handle Table Entry */ - ExUnlockHandleTableEntry(HandleTable, HandleEntry); - - /* Keep looping */ - i++; - } while (i < ObjectCount); - - /* For a Waitall, we can't have the same object more then once */ - if (WaitType == WaitAll) - { - /* Clear the main loop variable */ - i = 0; - - /* Start the loop */ - do - { - /* Check the current and forward object */ - for (j = i + 1; j < ObjectCount; j++) - { - /* Make sure they don't match */ - if (WaitObjects[i] == WaitObjects[j]) - { - /* Fail */ - Status = STATUS_INVALID_PARAMETER_MIX; - DPRINT1("Objects duplicated with WaitAll\n"); - goto Quickie; - } - } - - /* Keep looping */ - i++; - } while (i < ObjectCount); - } - - /* Now we can finally wait. Use SEH since it can raise an exception */ - _SEH_TRY - { - /* We're done playing with handles */ - LockInUse = FALSE; - KeLeaveCriticalRegion(); - - /* Do the kernel wait */ - Status = KeWaitForMultipleObjects(ObjectCount, - WaitObjects, - WaitType, - UserRequest, - PreviousMode, - Alertable, - TimeOut, - WaitBlockArray); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - -Quickie: - /* First derefence */ - while (ReferencedObjects) - { - ReferencedObjects--; - if (Objects[ReferencedObjects]) - { - ObDereferenceObject(Objects[ReferencedObjects]); - } - } - - /* Free wait block array */ - if (WaitBlockArray) ExFreePool(WaitBlockArray); - - /* Re-enable APCs if needed */ - if (LockInUse) KeLeaveCriticalRegion(); - - /* Return status */ - DPRINT("Returning: %x\n", Status); - return Status; -} - -/*++ -* @name NtWaitForSingleObject -* @implemented NT4 -* -* The NtWaitForSingleObject routine <FILLMEIN> -* -* @param ObjectHandle -* <FILLMEIN> -* -* @param Alertable -* <FILLMEIN> -* -* @param TimeOut -* <FILLMEIN> -* -* @return STATUS_SUCCESS or appropriate error value. -* -* @remarks None. -* -*--*/ -NTSTATUS -NTAPI -NtWaitForSingleObject(IN HANDLE ObjectHandle, - IN BOOLEAN Alertable, - IN PLARGE_INTEGER TimeOut OPTIONAL) -{ - PVOID Object, WaitableObject; - KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - LARGE_INTEGER SafeTimeOut; - NTSTATUS Status = STATUS_SUCCESS; - - DPRINT("NtWaitForSingleObject(ObjectHandle %x, Alertable %d, TimeOut %x)\n", - ObjectHandle,Alertable,TimeOut); - - /* Capture timeout */ - if(TimeOut && PreviousMode != KernelMode) - { - _SEH_TRY - { - /* Make a copy on the stack */ - SafeTimeOut = ProbeForReadLargeInteger(TimeOut); - TimeOut = &SafeTimeOut; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if(!NT_SUCCESS(Status)) return Status; - } - - /* Get the Object */ - Status = ObReferenceObjectByHandle(ObjectHandle, - SYNCHRONIZE, - NULL, - PreviousMode, - &Object, - NULL); - if (NT_SUCCESS(Status)) - { - /* Get the Waitable Object */ - WaitableObject = OBJECT_TO_OBJECT_HEADER(Object)->Type->DefaultObject; - - /* Is it an offset for internal objects? */ - if (IsPointerOffset(WaitableObject)) - { - /* Turn it into a pointer */ - WaitableObject = (PVOID)((ULONG_PTR)Object + - (ULONG_PTR)WaitableObject); - } - - /* Now wait. Also SEH this since it can also raise an exception */ - _SEH_TRY - { - Status = KeWaitForSingleObject(WaitableObject, - UserRequest, - PreviousMode, - Alertable, - TimeOut); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - /* Dereference the Object */ - ObDereferenceObject(Object); - } - - /* Return the status */ - return Status; -} - -/*++ -* @name NtSignalAndWaitForSingleObject -* @implemented NT4 -* -* The NtSignalAndWaitForSingleObject routine <FILLMEIN> -* -* @param ObjectHandleToSignal -* <FILLMEIN> -* -* @param WaitableObjectHandle -* <FILLMEIN> -* -* @param Alertable -* <FILLMEIN> -* -* @param TimeOut -* <FILLMEIN> -* -* @return STATUS_SUCCESS or appropriate error value. -* -* @remarks None. -* -*--*/ -NTSTATUS -NTAPI -NtSignalAndWaitForSingleObject(IN HANDLE ObjectHandleToSignal, - IN HANDLE WaitableObjectHandle, - IN BOOLEAN Alertable, - IN PLARGE_INTEGER TimeOut OPTIONAL) -{ - KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - POBJECT_TYPE Type; - PVOID SignalObj; - PVOID WaitObj; - PVOID WaitableObject; - LARGE_INTEGER SafeTimeOut; - OBJECT_HANDLE_INFORMATION HandleInfo; - NTSTATUS Status = STATUS_SUCCESS; - - /* Capture timeout */ - DPRINT("NtSignalAndWaitForSingleObject\n"); - if(TimeOut && PreviousMode != KernelMode) - { - _SEH_TRY - { - /* Make a copy on the stack */ - SafeTimeOut = ProbeForReadLargeInteger(TimeOut); - TimeOut = &SafeTimeOut; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if(!NT_SUCCESS(Status)) return Status; - } - - /* Start by getting the signal object*/ - Status = ObReferenceObjectByHandle(ObjectHandleToSignal, - 0, - NULL, - PreviousMode, - &SignalObj, - &HandleInfo); - if (!NT_SUCCESS(Status)) - { - return Status; - } - - /* Now get the wait object */ - Status = ObReferenceObjectByHandle(WaitableObjectHandle, - SYNCHRONIZE, - NULL, - PreviousMode, - &WaitObj, - NULL); - if (!NT_SUCCESS(Status)) - { - ObDereferenceObject(SignalObj); - return Status; - } - - /* Get the real waitable object */ - WaitableObject = OBJECT_TO_OBJECT_HEADER(WaitObj)->Type->DefaultObject; - - /* Handle internal offset */ - if (IsPointerOffset(WaitableObject)) - { - /* Get real pointer */ - WaitableObject = (PVOID)((ULONG_PTR)WaitObj + - (ULONG_PTR)WaitableObject); - } - - /* Check Signal Object Type */ - Type = OBJECT_TO_OBJECT_HEADER(WaitObj)->Type; - if (Type == ExEventObjectType) - { - /* Set the Event */ - /* FIXME: Check permissions */ - KeSetEvent(SignalObj, EVENT_INCREMENT, TRUE); - } - else if (Type == ExMutantObjectType) - { - /* Release the Mutant. This can raise an exception*/ - _SEH_TRY - { - KeReleaseMutant(SignalObj, MUTANT_INCREMENT, FALSE, TRUE); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - goto Quickie; - } - _SEH_END; - } - else if (Type == ExSemaphoreObjectType) - { - /* Release the Semaphore. This can raise an exception*/ - /* FIXME: Check permissions */ - _SEH_TRY - { - KeReleaseSemaphore(SignalObj, SEMAPHORE_INCREMENT, 1, TRUE); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - goto Quickie; - } - _SEH_END; - } - else - { - Status = STATUS_OBJECT_TYPE_MISMATCH; - DPRINT1("Waiting on invalid object type\n"); - goto Quickie; - } - - /* Now wait. Also SEH this since it can also raise an exception */ - _SEH_TRY - { - Status = KeWaitForSingleObject(WaitableObject, - UserRequest, - PreviousMode, - Alertable, - TimeOut); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - /* We're done here */ -Quickie: - ObDereferenceObject(SignalObj); - ObDereferenceObject(WaitObj); - return Status; -} - -/* EOF */

1 0

[jimtabor] 22493: Missed one line for sync to Wine.
by jimtabor＠svn.reactos.org 21 Jun '06

21 Jun '06

Author: jimtabor Date: Thu Jun 22 01:31:53 2006 New Revision: 22493 URL: http://svn.reactos.ru/svn/reactos?rev=22493&view=rev Log: Missed one line for sync to Wine. Modified: trunk/reactos/dll/win32/user32/controls/combo.c Modified: trunk/reactos/dll/win32/user32/controls/combo.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/user32/controls/c… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/combo.c (original) +++ trunk/reactos/dll/win32/user32/controls/combo.c Thu Jun 22 01:31:53 2006 @@ -148,7 +148,7 @@ if (COMBO_Init() && (lphc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(HEADCOMBO))) ) { lphc->self = hwnd; - SetWindowLongW( hwnd, 0, (LONG)lphc ); + SetWindowLongPtrW( hwnd, 0, (LONG_PTR)lphc ); /* some braindead apps do try to use scrollbar/border flags */

1 0

[gedmurphy] 22492: header changes for r22491
by gedmurphy＠svn.reactos.org 21 Jun '06

21 Jun '06

Author: gedmurphy Date: Thu Jun 22 01:20:28 2006 New Revision: 22492 URL: http://svn.reactos.ru/svn/reactos?rev=22492&view=rev Log: header changes for r22491 Modified: trunk/reactos/include/winreg.h Modified: trunk/reactos/include/winreg.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/include/winreg.h?rev=22492&… ============================================================================== --- trunk/reactos/include/winreg.h (original) +++ trunk/reactos/include/winreg.h Thu Jun 22 01:20:28 2006 @@ -37,6 +37,20 @@ #define REG_NOTIFY_CHANGE_LAST_SET 4 #define REG_NOTIFY_CHANGE_SECURITY 8 +#if (_WIN32_WINNT >= 0x0600) +#define RRF_RT_REG_NONE (1 << 0) +#define RRF_RT_REG_SZ (1 << 1) +#define RRF_RT_REG_EXPAND_SZ (1 << 2) +#define RRF_RT_REG_BINARY (1 << 3) +#define RRF_RT_REG_DWORD (1 << 4) +#define RRF_RT_REG_MULTI_SZ (1 << 5) +#define RRF_RT_REG_QWORD (1 << 6) +#define RRF_RT_DWORD (RRF_RT_REG_BINARY | RRF_RT_REG_DWORD) +#define RRF_RT_QWORD (RRF_RT_REG_BINARY | RRF_RT_REG_QWORD) +#define RRF_NOEXPAND (1 << 28) +#define RRF_ZEROONFAILURE (1 << 29) +#endif + #ifndef RC_INVOKED typedef ACCESS_MASK REGSAM; typedef struct value_entA { @@ -92,6 +106,10 @@ LONG WINAPI RegEnumKeyExW(HKEY,DWORD,LPWSTR,PDWORD,PDWORD,LPWSTR,PDWORD,PFILETIME); LONG WINAPI RegEnumValueA(HKEY,DWORD,LPSTR,PDWORD,PDWORD,PDWORD,LPBYTE,PDWORD); LONG WINAPI RegEnumValueW(HKEY,DWORD,LPWSTR,PDWORD,PDWORD,PDWORD,LPBYTE,PDWORD); +#if (_WIN32_WINNT >= 0x0600) +LONG WINAPI RegGetValueA(HKEY,LPCSTR,LPCSTR,DWORD,LPDWORD,PVOID,LPDWORD); +LONG WINAPI RegGetValueW(HKEY,LPCWSTR,LPCWSTR,DWORD,LPDWORD,PVOID,LPDWORD); +#endif LONG WINAPI RegFlushKey(HKEY); LONG WINAPI RegGetKeySecurity(HKEY,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR,PDWORD); LONG WINAPI RegLoadKeyA(HKEY,LPCSTR,LPCSTR); @@ -154,6 +172,9 @@ #define RegEnumKey RegEnumKeyW #define RegEnumKeyEx RegEnumKeyExW #define RegEnumValue RegEnumValueW +#if (_WIN32_WINNT >= 0x0600) +#define RegGetValue RegGetValueW +#endif #define RegLoadKey RegLoadKeyW #if (_WIN32_WINNT >= 0x0600) #define RegLoadMUIString RegLoadMUIStringW @@ -192,6 +213,9 @@ #define RegEnumKey RegEnumKeyA #define RegEnumKeyEx RegEnumKeyExA #define RegEnumValue RegEnumValueA +#if (_WIN32_WINNT >= 0x0600) +#define RegGetValue RegGetValueA +#endif #define RegLoadKey RegLoadKeyA #if (_WIN32_WINNT >= 0x0600) #define RegLoadMUIString RegLoadMUIStringA

1 0

[gedmurphy] 22491: Port RegGetValue() from WINE patch by Thomas Weidenmueller
by gedmurphy＠svn.reactos.org 21 Jun '06

21 Jun '06

Author: gedmurphy Date: Thu Jun 22 01:19:47 2006 New Revision: 22491 URL: http://svn.reactos.ru/svn/reactos?rev=22491&view=rev Log: Port RegGetValue() from WINE patch by Thomas Weidenmueller Modified: trunk/reactos/dll/win32/advapi32/advapi32.def trunk/reactos/dll/win32/advapi32/reg/reg.c Modified: trunk/reactos/dll/win32/advapi32/advapi32.def URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi32… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.def (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.def Thu Jun 22 01:19:47 2006 @@ -494,6 +494,8 @@ RegEnumValueW@32 RegFlushKey@4 RegGetKeySecurity@16 +RegGetValueA@28 +RegGetValueW@28 RegLoadKeyA@12 RegLoadKeyW@12 RegLoadMUIStringA@24 Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg.… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c Thu Jun 22 01:19:47 2006 @@ -1680,6 +1680,258 @@ return ERROR_CALL_NOT_IMPLEMENTED; } +/****************************************************************************** + * RegpApplyRestrictions [internal] + * + * Helper function for RegGetValueA/W. + */ +static VOID +RegpApplyRestrictions( DWORD dwFlags, DWORD dwType, DWORD cbData, + PLONG ret ) +{ + /* Check if the type is restricted by the passed flags */ + if (*ret == ERROR_SUCCESS || *ret == ERROR_MORE_DATA) + { + DWORD dwMask = 0; + + switch (dwType) + { + case REG_NONE: dwMask = RRF_RT_REG_NONE; break; + case REG_SZ: dwMask = RRF_RT_REG_SZ; break; + case REG_EXPAND_SZ: dwMask = RRF_RT_REG_EXPAND_SZ; break; + case REG_MULTI_SZ: dwMask = RRF_RT_REG_MULTI_SZ; break; + case REG_BINARY: dwMask = RRF_RT_REG_BINARY; break; + case REG_DWORD: dwMask = RRF_RT_REG_DWORD; break; + case REG_QWORD: dwMask = RRF_RT_REG_QWORD; break; + } + + if (dwFlags & dwMask) + { + /* Type is not restricted, check for size mismatch */ + if (dwType == REG_BINARY) + { + DWORD cbExpect = 0; + + if ((dwFlags & RRF_RT_DWORD) == RRF_RT_DWORD) + cbExpect = 4; + else if ((dwFlags & RRF_RT_DWORD) == RRF_RT_QWORD) + cbExpect = 8; + + if (cbExpect && cbData != cbExpect) + *ret = ERROR_DATATYPE_MISMATCH; + } + } + else *ret = ERROR_UNSUPPORTED_TYPE; + } +} + + +/****************************************************************************** + * RegGetValueW [ADVAPI32.@] + * + * Retrieves the type and data for a value name associated with a key + * optionally expanding it's content and restricting it's type. + * + * PARAMS + * hKey [I] Handle to an open key. + * pszSubKey [I] Name of the subkey of hKey. + * pszValue [I] Name of value under hKey/szSubKey to query. + * dwFlags [I] Flags restricting the value type to retrieve. + * pdwType [O] Destination for the values type, may be NULL. + * pvData [O] Destination for the values content, may be NULL. + * pcbData [I/O] Size of pvData, updated with the size required to + * retrieve the whole content. + * + * RETURNS + * Success: ERROR_SUCCESS + * Failure: nonzero error code from Winerror.h + * + * NOTES + * - Unless RRF_NOEXPAND is specified REG_EXPAND_SZ is automatically expanded + * and REG_SZ is retrieved instead. + * - Restrictions are applied after expanding, using RRF_RT_REG_EXPAND_SZ + * without RRF_NOEXPAND is thus not allowed. + */ +LONG WINAPI +RegGetValueW( HKEY hKey, LPCWSTR pszSubKey, LPCWSTR pszValue, + DWORD dwFlags, LPDWORD pdwType, PVOID pvData, + LPDWORD pcbData ) +{ + DWORD dwType, cbData = pcbData ? *pcbData : 0; + PVOID pvBuf = NULL; + LONG ret; + + TRACE("(%p,%s,%s,%ld,%p,%p,%p=%ld)\n", + hKey, debugstr_w(pszSubKey), debugstr_w(pszValue), dwFlags, pdwType, + pvData, pcbData, cbData); + + if ((dwFlags & RRF_RT_REG_EXPAND_SZ) && !(dwFlags & RRF_NOEXPAND)) + return ERROR_INVALID_PARAMETER; + + if (pszSubKey && pszSubKey[0]) + { + ret = RegOpenKeyExW(hKey, pszSubKey, 0, KEY_QUERY_VALUE, &hKey); + if (ret != ERROR_SUCCESS) return ret; + } + + ret = RegQueryValueExW(hKey, pszValue, NULL, &dwType, pvData, &cbData); + + /* If we are going to expand we need to read in the whole the value even + * if the passed buffer was too small as the expanded string might be + * smaller than the unexpanded one and could fit into cbData bytes. */ + if ((ret == ERROR_SUCCESS || ret == ERROR_MORE_DATA) && + (dwType == REG_EXPAND_SZ && !(dwFlags & RRF_NOEXPAND))) + { + do { + if (pvBuf) HeapFree(GetProcessHeap(), 0, pvBuf); + + pvBuf = HeapAlloc(GetProcessHeap(), 0, cbData); + if (!pvBuf) + { + ret = ERROR_NOT_ENOUGH_MEMORY; + break; + } + + if (ret == ERROR_MORE_DATA) + ret = RegQueryValueExW(hKey, pszValue, NULL, + &dwType, pvBuf, &cbData); + else + { + /* Even if cbData was large enough we have to copy the + * string since ExpandEnvironmentStrings can't handle + * overlapping buffers. */ + CopyMemory(pvBuf, pvData, cbData); + } + + /* Both the type or the value itself could have been modified in + * between so we have to keep retrying until the buffer is large + * enough or we no longer have to expand the value. */ + } while (dwType == REG_EXPAND_SZ && ret == ERROR_MORE_DATA); + + if (ret == ERROR_SUCCESS) + { + if (dwType == REG_EXPAND_SZ) + { + cbData = ExpandEnvironmentStringsW(pvBuf, pvData, + pcbData ? *pcbData : 0); + dwType = REG_SZ; + if(pcbData && cbData > *pcbData) + ret = ERROR_MORE_DATA; + } + else if (pcbData) + CopyMemory(pvData, pvBuf, *pcbData); + } + + if (pvBuf) HeapFree(GetProcessHeap(), 0, pvBuf); + } + + if (pszSubKey && pszSubKey[0]) + RegCloseKey(hKey); + + RegpApplyRestrictions(dwFlags, dwType, cbData, &ret); + + if (pcbData && ret != ERROR_SUCCESS && (dwFlags & RRF_ZEROONFAILURE)) + ZeroMemory(pvData, *pcbData); + + if (pdwType) *pdwType = dwType; + if (pcbData) *pcbData = cbData; + + return ret; +} + + +/****************************************************************************** + * RegGetValueA [ADVAPI32.@] + * + * See RegGetValueW. + */ +LONG WINAPI +RegGetValueA( HKEY hKey, LPCSTR pszSubKey, LPCSTR pszValue, + DWORD dwFlags, LPDWORD pdwType, PVOID pvData, + LPDWORD pcbData ) +{ + DWORD dwType, cbData = pcbData ? *pcbData : 0; + PVOID pvBuf = NULL; + LONG ret; + + TRACE("(%p,%s,%s,%ld,%p,%p,%p=%ld)\n", + hKey, pszSubKey, pszValue, dwFlags, pdwType, pvData, pcbData, + cbData); + + if ((dwFlags & RRF_RT_REG_EXPAND_SZ) && !(dwFlags & RRF_NOEXPAND)) + return ERROR_INVALID_PARAMETER; + + if (pszSubKey && pszSubKey[0]) + { + ret = RegOpenKeyExA(hKey, pszSubKey, 0, KEY_QUERY_VALUE, &hKey); + if (ret != ERROR_SUCCESS) return ret; + } + + ret = RegQueryValueExA(hKey, pszValue, NULL, &dwType, pvData, &cbData); + + /* If we are going to expand we need to read in the whole the value even + * if the passed buffer was too small as the expanded string might be + * smaller than the unexpanded one and could fit into cbData bytes. */ + if ((ret == ERROR_SUCCESS || ret == ERROR_MORE_DATA) && + (dwType == REG_EXPAND_SZ && !(dwFlags & RRF_NOEXPAND))) + { + do { + if (pvBuf) HeapFree(GetProcessHeap(), 0, pvBuf); + + pvBuf = HeapAlloc(GetProcessHeap(), 0, cbData); + if (!pvBuf) + { + ret = ERROR_NOT_ENOUGH_MEMORY; + break; + } + + if (ret == ERROR_MORE_DATA) + ret = RegQueryValueExA(hKey, pszValue, NULL, + &dwType, pvBuf, &cbData); + else + { + /* Even if cbData was large enough we have to copy the + * string since ExpandEnvironmentStrings can't handle + * overlapping buffers. */ + CopyMemory(pvBuf, pvData, cbData); + } + + /* Both the type or the value itself could have been modified in + * between so we have to keep retrying until the buffer is large + * enough or we no longer have to expand the value. */ + } while (dwType == REG_EXPAND_SZ && ret == ERROR_MORE_DATA); + + if (ret == ERROR_SUCCESS) + { + if (dwType == REG_EXPAND_SZ) + { + cbData = ExpandEnvironmentStringsA(pvBuf, pvData, + pcbData ? *pcbData : 0); + dwType = REG_SZ; + if(pcbData && cbData > *pcbData) + ret = ERROR_MORE_DATA; + } + else if (pcbData) + CopyMemory(pvData, pvBuf, *pcbData); + } + + if (pvBuf) HeapFree(GetProcessHeap(), 0, pvBuf); + } + + if (pszSubKey && pszSubKey[0]) + RegCloseKey(hKey); + + RegpApplyRestrictions(dwFlags, dwType, cbData, &ret); + + if (pcbData && ret != ERROR_SUCCESS && (dwFlags & RRF_ZEROONFAILURE)) + ZeroMemory(pvData, *pcbData); + + if (pdwType) *pdwType = dwType; + if (pcbData) *pcbData = cbData; + + return ret; +} + /************************************************************************ * RegSetKeyValueW

1 0

[greatlrd] 22490: Start adding qemu-system-ppc support.
by greatlrd＠svn.reactos.org 21 Jun '06

21 Jun '06

Author: greatlrd Date: Thu Jun 22 01:03:36 2006 New Revision: 22490 URL: http://svn.reactos.ru/svn/reactos?rev=22490&view=rev Log: Start adding qemu-system-ppc support. Modified: trunk/tools/Qemu GUI/QEmu.cs trunk/tools/Qemu GUI/bin/Release/Qemu GUI.exe trunk/tools/Qemu GUI/frmMain.cs Modified: trunk/tools/Qemu GUI/QEmu.cs URL: http://svn.reactos.ru/svn/reactos/trunk/tools/Qemu%20GUI/QEmu.cs?rev=22490&… ============================================================================== --- trunk/tools/Qemu GUI/QEmu.cs (original) +++ trunk/tools/Qemu GUI/QEmu.cs Thu Jun 22 01:03:36 2006 @@ -18,7 +18,10 @@ ARM_integratorcp926, ARM_integratorcp1026, ARM_versatilepb, - ARM_versatileab + ARM_versatileab, + PPC_g3bw, + PPC_mac99, + PPC_prep } [XmlRoot("Settings")] @@ -149,6 +152,11 @@ case Platforms.ARM_versatilepb: case Platforms.ARM_versatileab: p.StartInfo.FileName = this.Paths.QEmu + "\\qemu-system-arm.exe"; + break; + case Platforms.PPC_g3bw: + case Platforms.PPC_mac99: + case Platforms.PPC_prep: + p.StartInfo.FileName = this.Paths.QEmu + "\\qemu-system-ppc.exe"; break; } @@ -407,6 +415,17 @@ case Platforms.ARM_versatileab: buffer += "-M versatileab "; break; + case Platforms.PPC_g3bw: + buffer += "-M g3bw "; + break; + case Platforms.PPC_mac99: + buffer += "-M mac99 "; + break; + case Platforms.PPC_prep: + buffer += "-M prep "; + break; + + } /* Boot options */ Modified: trunk/tools/Qemu GUI/bin/Release/Qemu GUI.exe URL: http://svn.reactos.ru/svn/reactos/trunk/tools/Qemu%20GUI/bin/Release/Qemu%2… ============================================================================== Binary files - no diff available. Modified: trunk/tools/Qemu GUI/frmMain.cs URL: http://svn.reactos.ru/svn/reactos/trunk/tools/Qemu%20GUI/frmMain.cs?rev=224… ============================================================================== --- trunk/tools/Qemu GUI/frmMain.cs (original) +++ trunk/tools/Qemu GUI/frmMain.cs Thu Jun 22 01:03:36 2006 @@ -331,7 +331,10 @@ "ARM Integrator/CP (ARM926EJ-S) ", "ARM Integrator/CP (ARM1026EJ-S)", "ARM Versatile/PB (ARM926EJ-S)", - "ARM Versatile/AB (ARM926EJ-S)"}); + "ARM Versatile/AB (ARM926EJ-S)", + "PPC Heathrow based PowerMAC", + "PPC Mac99 based PowerMAC", + "PPC PowerPC PREP platform"}); this.cboMachine.Location = new System.Drawing.Point(19, 19); this.cboMachine.Name = "cboMachine"; this.cboMachine.Size = new System.Drawing.Size(239, 21);

1 0

[gedmurphy] 22489: load correct entry from registry
by gedmurphy＠svn.reactos.org 21 Jun '06

21 Jun '06

Author: gedmurphy Date: Thu Jun 22 00:46:37 2006 New Revision: 22489 URL: http://svn.reactos.ru/svn/reactos?rev=22489&view=rev Log: load correct entry from registry Modified: trunk/reactos/dll/cpl/timedate/timedate.c Modified: trunk/reactos/dll/cpl/timedate/timedate.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/timedate.c… ============================================================================== --- trunk/reactos/dll/cpl/timedate/timedate.c (original) +++ trunk/reactos/dll/cpl/timedate/timedate.c Thu Jun 22 00:46:37 2006 @@ -962,7 +962,7 @@ SendMessage(hList, CB_SETCURSEL, - --Default, + --Default, /* reg entries count from 1 */ 0); RegCloseKey(hKey); @@ -987,7 +987,8 @@ 0, 0); - _itow(Sel, szSel, 10); + /* reg entries count from 1 */ + _itow(++Sel, szSel, 10); Ret = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\DateTime\\Servers",

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