Ros-diffs May 2008

ros-diffs@reactos.org

25 participants
586 discussions

[mpiulachs] 33589: - remove now unneeded files
by mpiulachs＠svn.reactos.org 18 May '08

18 May '08

Author: mpiulachs Date: Sun May 18 11:04:19 2008 New Revision: 33589 URL: http://svn.reactos.org/svn/reactos?rev=33589&view=rev Log: - remove now unneeded files Removed: trunk/irc/TechBot/TechBot.Library/Commands/ApiCommand.cs trunk/irc/TechBot/TechBot.Library/Commands/BugCommand.cs trunk/irc/TechBot/TechBot.Library/Commands/HresultCommand.cs trunk/irc/TechBot/TechBot.Library/Commands/NtStatusCommand.cs trunk/irc/TechBot/TechBot.Library/Commands/ReactOSBugUrl.cs trunk/irc/TechBot/TechBot.Library/Commands/SambaBugUrl.cs trunk/irc/TechBot/TechBot.Library/Commands/SvnCommand.cs trunk/irc/TechBot/TechBot.Library/Commands/WineBugUrl.cs trunk/irc/TechBot/TechBot.Library/Commands/WinerrorCommand.cs trunk/irc/TechBot/TechBot.Library/Commands/WmCommand.cs Removed: trunk/irc/TechBot/TechBot.Library/Commands/ApiCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… ============================================================================== --- trunk/irc/TechBot/TechBot.Library/Commands/ApiCommand.cs [iso-8859-1] (original) +++ trunk/irc/TechBot/TechBot.Library/Commands/ApiCommand.cs (removed) @@ -1,333 +1,0 @@ -using System; -using System.IO; -using System.Data; -using System.Text.RegularExpressions; -using HtmlHelp; -using HtmlHelp.ChmDecoding; - -namespace TechBot.Library -{ - [Command("api", Help = "!api <apiname>")] - public class ApiCommand : Command - { - private const bool IsVerbose = false; - - private HtmlHelpSystem chm; - private string chmPath; - private string mainChm; - - public ApiCommand() - { - Run(); - } - - private void WriteIfVerbose(MessageContext context, - string message) - { - if (IsVerbose) - TechBot.ServiceOutput.WriteLine(context, - message); - } - - private void Run() - { - string CHMFilename = Path.Combine(chmPath, mainChm); - chm = new HtmlHelpSystem(); - chm.OpenFile(CHMFilename, null); - - Console.WriteLine(String.Format("Loaded main CHM: {0}", - Path.GetFileName(CHMFilename))); - foreach (string filename in Directory.GetFiles(chmPath)) - { - if (!Path.GetExtension(filename).ToLower().Equals(".chm")) - continue; - if (Path.GetFileName(filename).ToLower().Equals(mainChm)) - continue; - - Console.WriteLine(String.Format("Loading CHM: {0}", - Path.GetFileName(filename))); - try - { - chm.MergeFile(filename); - } - catch (Exception ex) - { - Console.WriteLine(String.Format("Could not load CHM: {0}. Exception {1}", - Path.GetFileName(filename), - ex)); - } - } - Console.WriteLine(String.Format("Loaded {0} CHMs", - chm.FileList.Length)); - } - - public override void Handle(MessageContext context) - { - if (parameters.Trim().Equals(String.Empty)) - DisplayNoKeyword(context); - else - Search(context, - parameters); - } - - private bool SearchIndex(MessageContext context, - string keyword) - { - if (chm.HasIndex) - { - IndexItem item = chm.Index.SearchIndex(keyword, - IndexType.KeywordLinks); - if (item != null && item.Topics.Count > 0) - { - WriteIfVerbose(context, - String.Format("Keyword {0} found in index", - item.KeyWord)); - IndexTopic indexTopic = item.Topics[0] as IndexTopic; - return DisplayResult(context, - keyword, - indexTopic); - } - else - { - WriteIfVerbose(context, - String.Format("Keyword {0} not found in index", - keyword)); - return false; - } - } - else - return false; - } - - private void SearchFullText(MessageContext context, - string keyword) - { - string sort = "Rating ASC"; - WriteIfVerbose(context, - String.Format("Searching fulltext database for {0}", - keyword)); - - bool partialMatches = false; - bool titlesOnly = true; - int maxResults = 100; - DataTable results = chm.PerformSearch(keyword, - maxResults, - partialMatches, - titlesOnly); - WriteIfVerbose(context, - String.Format("results.Rows.Count = {0}", - results != null ? - results.Rows.Count.ToString() : "(none)")); - if (results != null && results.Rows.Count > 0) - { - results.DefaultView.Sort = sort; - if (!DisplayResult(context, - keyword, - results)) - { - DisplayNoResult(context, - keyword); - } - } - else - { - DisplayNoResult(context, - keyword); - } - } - - private void Search(MessageContext context, - string keyword) - { - if (!SearchIndex(context, - keyword)) - SearchFullText(context, - keyword); - } - - private bool DisplayResult(MessageContext context, - string keyword, - IndexTopic indexTopic) - { - keyword = keyword.Trim().ToLower(); - string url = indexTopic.URL; - WriteIfVerbose(context, - String.Format("URL from index search {0}", - url)); - string prototype = ExtractPrototype(context, - url); - if (prototype == null || prototype.Trim().Equals(String.Empty)) - return false; - string formattedPrototype = FormatPrototype(prototype); - TechBot.ServiceOutput.WriteLine(context, - formattedPrototype); - return true; - } - - private bool DisplayResult(MessageContext context, - string keyword, - DataTable results) - { - keyword = keyword.Trim().ToLower(); - for (int i = 0; i < results.DefaultView.Count; i++) - { - DataRowView row = results.DefaultView[i]; - string title = row["Title"].ToString(); - WriteIfVerbose(context, - String.Format("Examining {0}", title)); - if (title.Trim().ToLower().Equals(keyword)) - { - string location = row["Location"].ToString(); - string rating = row["Rating"].ToString(); - string url = row["Url"].ToString(); - string prototype = ExtractPrototype(context, - url); - if (prototype == null || prototype.Trim().Equals(String.Empty)) - continue; - string formattedPrototype = FormatPrototype(prototype); - TechBot.ServiceOutput.WriteLine(context, - formattedPrototype); - return true; - } - } - return false; - } - - private void DisplayNoResult(MessageContext context, - string keyword) - { - TechBot.ServiceOutput.WriteLine(context, - String.Format("I don't know about keyword {0}", - keyword)); - } - - private void DisplayNoKeyword(MessageContext context) - { - TechBot.ServiceOutput.WriteLine(context, - "Please give me a keyword."); - } - - private string ReplaceComments(string s) - { - return Regex.Replace(s, "//(.+)\r\n", ""); - } - - private string ReplaceLineEndings(string s) - { - return Regex.Replace(s, "(\r\n)+", " "); - } - - private string ReplaceSpaces(string s) - { - return Regex.Replace(s, @" +", " "); - } - - private string ReplaceSpacesBeforeLeftParenthesis(string s) - { - return Regex.Replace(s, @"\( ", @"("); - } - - private string ReplaceSpacesBeforeRightParenthesis(string s) - { - return Regex.Replace(s, @" \)", @")"); - } - - private string ReplaceSemicolon(string s) - { - return Regex.Replace(s, @";", @""); - } - - private string FormatPrototype(string prototype) - { - string s = ReplaceComments(prototype); - s = ReplaceLineEndings(s); - s = ReplaceSpaces(s); - s = ReplaceSpacesBeforeLeftParenthesis(s); - s = ReplaceSpacesBeforeRightParenthesis(s); - s = ReplaceSemicolon(s); - return s; - } - - private string ExtractPrototype(MessageContext context, - string url) - { - string page = GetPage(context, - url); - Match match = Regex.Match(page, - "<PRE class=\"?syntax\"?>(.+)</PRE>", - RegexOptions.Multiline | - RegexOptions.Singleline); - if (match.Groups.Count > 1) - { - string prototype = match.Groups[1].ToString(); - return StripHtml(StripAfterSlashPre(prototype)); - } - - return ""; - } - - private string StripAfterSlashPre(string html) - { - int index = html.IndexOf("</PRE>"); - if (index != -1) - { - return html.Substring(0, index); - } - else - return html; - } - - private string StripHtml(string html) - { - return Regex.Replace(html, @"<(.|\n)*?>", String.Empty); - } - - private string GetPage(MessageContext context, - string url) - { - string CHMFileName = ""; - string topicName = ""; - string anchor = ""; - CHMStream.CHMStream baseStream; - if (!chm.BaseStream.GetCHMParts(url, ref CHMFileName, ref topicName, ref anchor)) - { - baseStream = chm.BaseStream; - CHMFileName = baseStream.CHMFileName; - topicName = url; - anchor = ""; - } - else - { - baseStream = GetBaseStreamFromCHMFileName(context, - CHMFileName); - } - - if ((topicName == "") || (CHMFileName == "") || (baseStream == null)) - { - return ""; - } - - return baseStream.ExtractTextFile(topicName); - } - - private CHMStream.CHMStream GetBaseStreamFromCHMFileName(MessageContext context, - string CHMFileName) - { - foreach (CHMFile file in chm.FileList) - { - WriteIfVerbose(context, - String.Format("Compare: {0} <> {1}", - file.ChmFilePath, - CHMFileName)); - if (file.ChmFilePath.ToLower().Equals(CHMFileName.ToLower())) - { - return file.BaseStream; - } - } - WriteIfVerbose(context, - String.Format("Could not find loaded CHM file in list: {0}", - CHMFileName)); - return null; - } - } -} Removed: trunk/irc/TechBot/TechBot.Library/Commands/BugCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… ============================================================================== --- trunk/irc/TechBot/TechBot.Library/Commands/BugCommand.cs [iso-8859-1] (original) +++ trunk/irc/TechBot/TechBot.Library/Commands/BugCommand.cs (removed) @@ -1,41 +1,0 @@ -using System; - -namespace TechBot.Library -{ - public abstract class BugCommand : Command - { - private string m_BugID = null; - - public BugCommand() - { - } - - [CommandParameter("id", "The bug ID")] - public string BugID - { - get { return m_BugID; } - set { m_BugID = value; } - } - - public override void ExecuteCommand() - { - if (BugID == null) - { - Say("Please provide a valid bug number."); - } - else - { - try - { - Say(BugUrl, Int32.Parse(BugID)); - } - catch (Exception) - { - Say("{0} is not a valid bug number.", BugID); - } - } - } - - protected abstract string BugUrl { get; } - } -} Removed: trunk/irc/TechBot/TechBot.Library/Commands/HresultCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… ============================================================================== --- trunk/irc/TechBot/TechBot.Library/Commands/HresultCommand.cs [iso-8859-1] (original) +++ trunk/irc/TechBot/TechBot.Library/Commands/HresultCommand.cs (removed) @@ -1,69 +1,0 @@ -using System; -using System.Xml; - -namespace TechBot.Library -{ - [Command("hresult", Help = "!hresult <value>")] - public class HResultCommand : XmlLookupCommand - { - public HResultCommand() - { - } - - public override string XmlFile - { - get { return Settings.Default.HResultXml; } - } - - public override void ExecuteCommand() - { - if (Text.Equals(String.Empty)) - { - TechBot.ServiceOutput.WriteLine(Context, - "Please provide a valid HRESULT value."); - return; - } - - NumberParser np = new NumberParser(); - long hresult = np.Parse(Text); - if (np.Error) - { - TechBot.ServiceOutput.WriteLine(Context, - String.Format("{0} is not a valid HRESULT value.", - Text)); - return; - } - - string description = GetHresultDescription(hresult); - if (description != null) - { - TechBot.ServiceOutput.WriteLine(Context, - String.Format("{0} is {1}.", - Text, - description)); - } - else - { - TechBot.ServiceOutput.WriteLine(Context, - String.Format("I don't know about HRESULT {0}.", - Text)); - } - } - - public string GetHresultDescription(long hresult) - { - XmlElement root = base.m_XmlDocument.DocumentElement; - XmlNode node = root.SelectSingleNode(String.Format("Hresult[@value='{0}']", - hresult.ToString("X8"))); - if (node != null) - { - XmlAttribute text = node.Attributes["text"]; - if (text == null) - throw new Exception("Node has no text attribute."); - return text.Value; - } - else - return null; - } - } -} Removed: trunk/irc/TechBot/TechBot.Library/Commands/NtStatusCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… ============================================================================== --- trunk/irc/TechBot/TechBot.Library/Commands/NtStatusCommand.cs [iso-8859-1] (original) +++ trunk/irc/TechBot/TechBot.Library/Commands/NtStatusCommand.cs (removed) @@ -1,69 +1,0 @@ -using System; -using System.Xml; - -namespace TechBot.Library -{ - [Command("ntstatus", Help = "!ntstatus <value>")] - public class NtStatusCommand : XmlLookupCommand - { - public NtStatusCommand() - { - } - - public override string XmlFile - { - get { return Settings.Default.NtStatusXml; } - } - - public override void ExecuteCommand() - { - if (Text.Equals(String.Empty)) - { - TechBot.ServiceOutput.WriteLine(Context, - "Please provide a valid NTSTATUS value."); - return; - } - - NumberParser np = new NumberParser(); - long ntstatus = np.Parse(Text); - if (np.Error) - { - TechBot.ServiceOutput.WriteLine(Context, - String.Format("{0} is not a valid NTSTATUS value.", - Text)); - return; - } - - string description = GetNtstatusDescription(ntstatus); - if (description != null) - { - TechBot.ServiceOutput.WriteLine(Context, - String.Format("{0} is {1}.", - Text, - description)); - } - else - { - TechBot.ServiceOutput.WriteLine(Context, - String.Format("I don't know about NTSTATUS {0}.", - Text)); - } - } - - public string GetNtstatusDescription(long ntstatus) - { - XmlElement root = base.m_XmlDocument.DocumentElement; - XmlNode node = root.SelectSingleNode(String.Format("Ntstatus[@value='{0}']", - ntstatus.ToString("X8"))); - if (node != null) - { - XmlAttribute text = node.Attributes["text"]; - if (text == null) - throw new Exception("Node has no text attribute."); - return text.Value; - } - else - return null; - } - } -} Removed: trunk/irc/TechBot/TechBot.Library/Commands/ReactOSBugUrl.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… ============================================================================== --- trunk/irc/TechBot/TechBot.Library/Commands/ReactOSBugUrl.cs [iso-8859-1] (original) +++ trunk/irc/TechBot/TechBot.Library/Commands/ReactOSBugUrl.cs (removed) @@ -1,19 +1,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace TechBot.Library -{ - [Command("rosbug", Help = "!rosbug <number>")] - class ReactOSBugUrl : BugCommand - { - public ReactOSBugUrl() - { - } - - protected override string BugUrl - { - get { return "http://www.reactos.org/bugzilla/show_bug.cgi?id={0}"; } - } - } -} Removed: trunk/irc/TechBot/TechBot.Library/Commands/SambaBugUrl.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… ============================================================================== --- trunk/irc/TechBot/TechBot.Library/Commands/SambaBugUrl.cs [iso-8859-1] (original) +++ trunk/irc/TechBot/TechBot.Library/Commands/SambaBugUrl.cs (removed) @@ -1,19 +1,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace TechBot.Library -{ - [Command("sambabug", Help = "!sambabug <number>")] - class SambaBugUrl : BugCommand - { - public SambaBugUrl() - { - } - - protected override string BugUrl - { - get { return "https://bugzilla.samba.org/show_bug.cgi?id={0}"; } - } - } -} Removed: trunk/irc/TechBot/TechBot.Library/Commands/SvnCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… ============================================================================== --- trunk/irc/TechBot/TechBot.Library/Commands/SvnCommand.cs [iso-8859-1] (original) +++ trunk/irc/TechBot/TechBot.Library/Commands/SvnCommand.cs (removed) @@ -1,20 +1,0 @@ -using System; - -namespace TechBot.Library -{ - [Command("svn", Help = "!svn")] - public class SvnCommand : Command - { - private string m_SvnRoot; - - public SvnCommand() - { - m_SvnRoot = Settings.Default.SVNRoot; - } - - public override void ExecuteCommand() - { - Say("svn co {0}", m_SvnRoot); - } - } -} Removed: trunk/irc/TechBot/TechBot.Library/Commands/WineBugUrl.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… ============================================================================== --- trunk/irc/TechBot/TechBot.Library/Commands/WineBugUrl.cs [iso-8859-1] (original) +++ trunk/irc/TechBot/TechBot.Library/Commands/WineBugUrl.cs (removed) @@ -1,19 +1,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace TechBot.Library -{ - [Command("winebug", Help = "!winebug <number>")] - class WineBugUrl : BugCommand - { - public WineBugUrl() - { - } - - protected override string BugUrl - { - get { return "http://bugs.winehq.org/show_bug.cgi?id={0}"; } - } - } -} Removed: trunk/irc/TechBot/TechBot.Library/Commands/WinerrorCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… ============================================================================== --- trunk/irc/TechBot/TechBot.Library/Commands/WinerrorCommand.cs [iso-8859-1] (original) +++ trunk/irc/TechBot/TechBot.Library/Commands/WinerrorCommand.cs (removed) @@ -1,69 +1,0 @@ -using System; -using System.Xml; - -namespace TechBot.Library -{ - [Command("winerror", Help = "!winerror <value>")] - public class WinErrorCommand : XmlLookupCommand - { - public WinErrorCommand() - { - } - - public override string XmlFile - { - get { return Settings.Default.WinErrorXml; } - } - - public override void ExecuteCommand() - { - if (Text.Equals(String.Empty)) - { - TechBot.ServiceOutput.WriteLine(Context, - "Please provide a valid System Error Code value."); - return; - } - - NumberParser np = new NumberParser(); - long winerror = np.Parse(Text); - if (np.Error) - { - TechBot.ServiceOutput.WriteLine(Context, - String.Format("{0} is not a valid System Error Code value.", - Text)); - return; - } - - string description = GetWinerrorDescription(winerror); - if (description != null) - { - TechBot.ServiceOutput.WriteLine(Context, - String.Format("{0} is {1}.", - Text, - description)); - } - else - { - TechBot.ServiceOutput.WriteLine(Context, - String.Format("I don't know about System Error Code {0}.", - Text)); - } - } - - public string GetWinerrorDescription(long winerror) - { - XmlElement root = base.m_XmlDocument.DocumentElement; - XmlNode node = root.SelectSingleNode(String.Format("Winerror[@value='{0}']", - Text)); - if (node != null) - { - XmlAttribute text = node.Attributes["text"]; - if (text == null) - throw new Exception("Node has no text attribute."); - return text.Value; - } - else - return null; - } - } -} Removed: trunk/irc/TechBot/TechBot.Library/Commands/WmCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… ============================================================================== --- trunk/irc/TechBot/TechBot.Library/Commands/WmCommand.cs [iso-8859-1] (original) +++ trunk/irc/TechBot/TechBot.Library/Commands/WmCommand.cs (removed) @@ -1,96 +1,0 @@ -using System; -using System.Xml; - -namespace TechBot.Library -{ - [Command("wm" , Help = "!wm <value> or !wm <name>")] - public class WMCommand : XmlCommand - { - private string m_WMText = null; - - public WMCommand() - { - } - - public override string XmlFile - { - get { return Settings.Default.WMXml; } - } - - [CommandParameter("wm", "The windows message to check")] - public string WMText - { - get { return m_WMText; } - set { m_WMText = value; } - } - - public override void ExecuteCommand() - { - if (WMText.Equals(String.Empty)) - { - TechBot.ServiceOutput.WriteLine(Context, - "Please provide a valid window message value or name."); - return; - } - - NumberParser np = new NumberParser(); - long wm = np.Parse(WMText); - string output; - if (np.Error) - { - // Assume "!wm <name>" form. - output = GetWmNumber(WMText); - } - else - { - output = GetWmDescription(wm); - } - - if (output != null) - { - TechBot.ServiceOutput.WriteLine(Context, - String.Format("{0} is {1}.", - WMText, - output)); - } - else - { - TechBot.ServiceOutput.WriteLine(Context, - String.Format("I don't know about window message {0}.", - WMText)); - } - } - - private string GetWmDescription(long wm) - { - XmlElement root = base.m_XmlDocument.DocumentElement; - XmlNode node = root.SelectSingleNode(String.Format("WindowMessage[@value='{0}']", - wm)); - if (node != null) - { - XmlAttribute text = node.Attributes["text"]; - if (text == null) - throw new Exception("Node has no text attribute."); - return text.Value; - } - else - return null; - } - - private string GetWmNumber(string wmName) - { - XmlElement root = base.m_XmlDocument.DocumentElement; - XmlNode node = root.SelectSingleNode(String.Format("WindowMessage[@text='{0}']", - wmName)); - if (node != null) - { - XmlAttribute value = node.Attributes["value"]; - if (value == null) - throw new Exception("Node has no value attribute."); - return value.Value; - } - else - return null; - } - } -}

1 0

[mpiulachs] 33588: - small fix
by mpiulachs＠svn.reactos.org 18 May '08

18 May '08

Author: mpiulachs Date: Sun May 18 11:01:34 2008 New Revision: 33588 URL: http://svn.reactos.org/svn/reactos?rev=33588&view=rev Log: - small fix Modified: trunk/irc/TechBot/TechBot.Commands.Common/Base/BugCommand.cs trunk/irc/TechBot/TechBot.Commands.Common/HResultCommand.cs trunk/irc/TechBot/TechBot.Commands.Common/NtStatusCommand.cs trunk/irc/TechBot/TechBot.Commands.Common/WMCommand.cs trunk/irc/TechBot/TechBot.Commands.Common/WinerrorCommand.cs trunk/irc/TechBot/TechBot.Library/Commands/HelpCommand.cs Modified: trunk/irc/TechBot/TechBot.Commands.Common/Base/BugCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Commands.Commo… ============================================================================== --- trunk/irc/TechBot/TechBot.Commands.Common/Base/BugCommand.cs [iso-8859-1] (original) +++ trunk/irc/TechBot/TechBot.Commands.Common/Base/BugCommand.cs [iso-8859-1] Sun May 18 11:01:34 2008 @@ -20,7 +20,7 @@ public override void ExecuteCommand() { - if (Parameters == null) + if (string.IsNullOrEmpty(BugID)) { Say("Please provide a valid bug number."); } Modified: trunk/irc/TechBot/TechBot.Commands.Common/HResultCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Commands.Commo… ============================================================================== --- trunk/irc/TechBot/TechBot.Commands.Common/HResultCommand.cs [iso-8859-1] (original) +++ trunk/irc/TechBot/TechBot.Commands.Common/HResultCommand.cs [iso-8859-1] Sun May 18 11:01:34 2008 @@ -19,7 +19,7 @@ public override void ExecuteCommand() { - if (Text == null) + if (string.IsNullOrEmpty(Text)) { Say("Please provide a valid HRESULT value."); } Modified: trunk/irc/TechBot/TechBot.Commands.Common/NtStatusCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Commands.Commo… ============================================================================== --- trunk/irc/TechBot/TechBot.Commands.Common/NtStatusCommand.cs [iso-8859-1] (original) +++ trunk/irc/TechBot/TechBot.Commands.Common/NtStatusCommand.cs [iso-8859-1] Sun May 18 11:01:34 2008 @@ -19,7 +19,7 @@ public override void ExecuteCommand() { - if (Text == null) + if (string.IsNullOrEmpty(Text)) { Say("Please provide a valid NTSTATUS value."); } Modified: trunk/irc/TechBot/TechBot.Commands.Common/WMCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Commands.Commo… ============================================================================== --- trunk/irc/TechBot/TechBot.Commands.Common/WMCommand.cs [iso-8859-1] (original) +++ trunk/irc/TechBot/TechBot.Commands.Common/WMCommand.cs [iso-8859-1] Sun May 18 11:01:34 2008 @@ -26,7 +26,7 @@ public override void ExecuteCommand() { - if (WMText == null) + if (string.IsNullOrEmpty(WMText)) { Say("Please provide a valid window message value or name."); Modified: trunk/irc/TechBot/TechBot.Commands.Common/WinerrorCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Commands.Commo… ============================================================================== --- trunk/irc/TechBot/TechBot.Commands.Common/WinerrorCommand.cs [iso-8859-1] (original) +++ trunk/irc/TechBot/TechBot.Commands.Common/WinerrorCommand.cs [iso-8859-1] Sun May 18 11:01:34 2008 @@ -19,7 +19,7 @@ public override void ExecuteCommand() { - if (Text == null) + if (string.IsNullOrEmpty(Text)) { Say("Please provide a valid System Error Code value."); } Modified: trunk/irc/TechBot/TechBot.Library/Commands/HelpCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… ============================================================================== --- trunk/irc/TechBot/TechBot.Library/Commands/HelpCommand.cs [iso-8859-1] (original) +++ trunk/irc/TechBot/TechBot.Library/Commands/HelpCommand.cs [iso-8859-1] Sun May 18 11:01:34 2008 @@ -7,8 +7,6 @@ [Command("help", Help = "!help or !help -name:[CommandName]", Description = "Shows this help , type 'help -name:[CommandName]'")] public class HelpCommand : Command { - private string m_CommandName = null; - public HelpCommand() { } @@ -22,7 +20,7 @@ public override void ExecuteCommand() { - if (CommandName == null) + if (string.IsNullOrEmpty(CommandName)) { Say("I support the following commands:");

1 0

[hpoussin] 33587: Send an empty string, as required by the documentation See issue #3202 for more details.
by hpoussin＠svn.reactos.org 18 May '08

18 May '08

Author: hpoussin Date: Sun May 18 11:01:29 2008 New Revision: 33587 URL: http://svn.reactos.org/svn/reactos?rev=33587&view=rev Log: Send an empty string, as required by the documentation See issue #3202 for more details. Modified: trunk/reactos/dll/win32/advapi32/service/eventlog.c Modified: trunk/reactos/dll/win32/advapi32/service/eventlog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/eventlog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/eventlog.c [iso-8859-1] Sun May 18 11:01:29 2008 @@ -33,6 +33,8 @@ IELF_HANDLE LogHandle; BOOL bLocal; } LOG_INFO, *PLOG_INFO; + +static RPC_UNICODE_STRING EmptyString = { 0, 0, L"" }; /****************************************************************************** * BackupEventLogA [ADVAPI32.@] @@ -560,7 +562,7 @@ pLog->BindingHandle, (LPWSTR)lpUNCServerName, &SourceName, - NULL, + &EmptyString, 0, 0, &pLog->LogHandle); @@ -777,7 +779,7 @@ pLog->BindingHandle, (LPWSTR)lpUNCServerName, &SourceName, - NULL, + &EmptyString, 0, 0, &pLog->LogHandle);

1 0

[mpiulachs] 33586: - Moved commands outside TechBot.Library to TechBot.Commands.Common and TechBot.Commands.MSDN except for Command base classes - Made TechBot more configurable through .config files - Code refactoring - Removed automatic parameter parsing support to make everyone happy
by mpiulachs＠svn.reactos.org 18 May '08

18 May '08

Author: mpiulachs Date: Sun May 18 10:54:43 2008 New Revision: 33586 URL: http://svn.reactos.org/svn/reactos?rev=33586&view=rev Log: - Moved commands outside TechBot.Library to TechBot.Commands.Common and TechBot.Commands.MSDN except for Command base classes - Made TechBot more configurable through .config files - Code refactoring - Removed automatic parameter parsing support to make everyone happy Added: trunk/irc/TechBot/TechBot.Commands.Common/ trunk/irc/TechBot/TechBot.Commands.Common/Base/ trunk/irc/TechBot/TechBot.Commands.Common/Base/BugCommand.cs (with props) trunk/irc/TechBot/TechBot.Commands.Common/HResultCommand.cs (with props) trunk/irc/TechBot/TechBot.Commands.Common/NtStatusCommand.cs (with props) trunk/irc/TechBot/TechBot.Commands.Common/Properties/ trunk/irc/TechBot/TechBot.Commands.Common/Properties/AssemblyInfo.cs (with props) trunk/irc/TechBot/TechBot.Commands.Common/ReactOSBugUrl.cs (with props) trunk/irc/TechBot/TechBot.Commands.Common/SambaBugUrl.cs (with props) trunk/irc/TechBot/TechBot.Commands.Common/Settings.Designer.cs (with props) trunk/irc/TechBot/TechBot.Commands.Common/Settings.cs (with props) trunk/irc/TechBot/TechBot.Commands.Common/Settings.settings (with props) trunk/irc/TechBot/TechBot.Commands.Common/SvnCommand.cs (with props) trunk/irc/TechBot/TechBot.Commands.Common/TechBot.Commands.Common.csproj (with props) trunk/irc/TechBot/TechBot.Commands.Common/WMCommand.cs (with props) trunk/irc/TechBot/TechBot.Commands.Common/WineBugUrl.cs (with props) trunk/irc/TechBot/TechBot.Commands.Common/WinerrorCommand.cs (with props) trunk/irc/TechBot/TechBot.Commands.Common/app.config (with props) trunk/irc/TechBot/TechBot.Commands.MSDN/ trunk/irc/TechBot/TechBot.Commands.MSDN/ApiCommand.cs (with props) trunk/irc/TechBot/TechBot.Commands.MSDN/Properties/ trunk/irc/TechBot/TechBot.Commands.MSDN/Properties/AssemblyInfo.cs (with props) trunk/irc/TechBot/TechBot.Commands.MSDN/Settings.Designer.cs (with props) trunk/irc/TechBot/TechBot.Commands.MSDN/Settings.settings (with props) trunk/irc/TechBot/TechBot.Commands.MSDN/TechBot.Commands.MSDN.csproj (with props) trunk/irc/TechBot/TechBot.Commands.MSDN/TechBot.Commands.MSDN.csproj.user (with props) trunk/irc/TechBot/TechBot.Commands.MSDN/app.config (with props) trunk/irc/TechBot/TechBot.Console/Settings.Designer.cs (with props) trunk/irc/TechBot/TechBot.Console/Settings.settings (with props) trunk/irc/TechBot/TechBot.IRCLibrary/app.config (with props) trunk/irc/TechBot/TechBot/Settings.Designer.cs (with props) trunk/irc/TechBot/TechBot/Settings.settings (with props) Modified: trunk/irc/TechBot/ (props changed) trunk/irc/TechBot/TechBot.Console/App.config (contents, props changed) trunk/irc/TechBot/TechBot.Console/ConsoleTechBotService.cs trunk/irc/TechBot/TechBot.Console/Main.cs (contents, props changed) trunk/irc/TechBot/TechBot.Console/TechBot.Console.csproj trunk/irc/TechBot/TechBot.IRCLibrary/TechBot.IRCLibrary.csproj trunk/irc/TechBot/TechBot.Library/Attributes/CommandParameterAttribute.cs trunk/irc/TechBot/TechBot.Library/Commands/Base/Command.cs trunk/irc/TechBot/TechBot.Library/Commands/Base/XmlLookupCommand.cs trunk/irc/TechBot/TechBot.Library/Commands/HelpCommand.cs trunk/irc/TechBot/TechBot.Library/Factory/CommandFactory.cs trunk/irc/TechBot/TechBot.Library/Settings.Designer.cs trunk/irc/TechBot/TechBot.Library/Settings.settings trunk/irc/TechBot/TechBot.Library/TechBot.Library.csproj trunk/irc/TechBot/TechBot.Library/TechBotIrcService.cs trunk/irc/TechBot/TechBot.Library/TechBotService.cs (contents, props changed) trunk/irc/TechBot/TechBot.Library/app.config trunk/irc/TechBot/TechBot.sln trunk/irc/TechBot/TechBot/App.config (contents, props changed) trunk/irc/TechBot/TechBot/ServiceThread.cs (contents, props changed) trunk/irc/TechBot/TechBot/TechBot.csproj [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/irc/TechBot/TechBot.Commands.Common/Base/BugCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Commands.Commo… Added: trunk/irc/TechBot/TechBot.Commands.Common/HResultCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Commands.Commo… Added: trunk/irc/TechBot/TechBot.Commands.Common/NtStatusCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Commands.Commo… Added: trunk/irc/TechBot/TechBot.Commands.Common/Properties/AssemblyInfo.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Commands.Commo… Added: trunk/irc/TechBot/TechBot.Commands.Common/ReactOSBugUrl.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Commands.Commo… Added: trunk/irc/TechBot/TechBot.Commands.Common/SambaBugUrl.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Commands.Commo… Added: trunk/irc/TechBot/TechBot.Commands.Common/Settings.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Commands.Commo… Added: trunk/irc/TechBot/TechBot.Commands.Common/Settings.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Commands.Commo… Added: trunk/irc/TechBot/TechBot.Commands.Common/Settings.settings URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Commands.Commo… Added: trunk/irc/TechBot/TechBot.Commands.Common/SvnCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Commands.Commo… Added: trunk/irc/TechBot/TechBot.Commands.Common/TechBot.Commands.Common.csproj URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Commands.Commo… Added: trunk/irc/TechBot/TechBot.Commands.Common/WMCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Commands.Commo… Added: trunk/irc/TechBot/TechBot.Commands.Common/WineBugUrl.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Commands.Commo… Added: trunk/irc/TechBot/TechBot.Commands.Common/WinerrorCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Commands.Commo… Added: trunk/irc/TechBot/TechBot.Commands.Common/app.config URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Commands.Commo… Added: trunk/irc/TechBot/TechBot.Commands.MSDN/ApiCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Commands.MSDN/… Added: trunk/irc/TechBot/TechBot.Commands.MSDN/Properties/AssemblyInfo.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Commands.MSDN/… Added: trunk/irc/TechBot/TechBot.Commands.MSDN/Settings.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Commands.MSDN/… Added: trunk/irc/TechBot/TechBot.Commands.MSDN/Settings.settings URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Commands.MSDN/… Added: trunk/irc/TechBot/TechBot.Commands.MSDN/TechBot.Commands.MSDN.csproj URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Commands.MSDN/… Added: trunk/irc/TechBot/TechBot.Commands.MSDN/TechBot.Commands.MSDN.csproj.user URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Commands.MSDN/… Added: trunk/irc/TechBot/TechBot.Commands.MSDN/app.config URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Commands.MSDN/… Modified: trunk/irc/TechBot/TechBot.Console/App.config URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Console/App.co… Modified: trunk/irc/TechBot/TechBot.Console/ConsoleTechBotService.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Console/Consol… Modified: trunk/irc/TechBot/TechBot.Console/Main.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Console/Main.c… Added: trunk/irc/TechBot/TechBot.Console/Settings.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Console/Settin… Added: trunk/irc/TechBot/TechBot.Console/Settings.settings URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Console/Settin… Modified: trunk/irc/TechBot/TechBot.Console/TechBot.Console.csproj URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Console/TechBo… Modified: trunk/irc/TechBot/TechBot.IRCLibrary/TechBot.IRCLibrary.csproj URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.IRCLibrary/Tec… Added: trunk/irc/TechBot/TechBot.IRCLibrary/app.config URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.IRCLibrary/app… Modified: trunk/irc/TechBot/TechBot.Library/Attributes/CommandParameterAttribute.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Attrib… Modified: trunk/irc/TechBot/TechBot.Library/Commands/Base/Command.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… Modified: trunk/irc/TechBot/TechBot.Library/Commands/Base/XmlLookupCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… Modified: trunk/irc/TechBot/TechBot.Library/Commands/HelpCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Comman… Modified: trunk/irc/TechBot/TechBot.Library/Factory/CommandFactory.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Factor… Modified: trunk/irc/TechBot/TechBot.Library/Settings.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Settin… Modified: trunk/irc/TechBot/TechBot.Library/Settings.settings URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Settin… Modified: trunk/irc/TechBot/TechBot.Library/TechBot.Library.csproj URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/TechBo… Modified: trunk/irc/TechBot/TechBot.Library/TechBotIrcService.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/TechBo… Modified: trunk/irc/TechBot/TechBot.Library/TechBotService.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/TechBo… Modified: trunk/irc/TechBot/TechBot.Library/app.config URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/app.co… Modified: trunk/irc/TechBot/TechBot.sln URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.sln?rev=33586&… Modified: trunk/irc/TechBot/TechBot/App.config URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot/App.config?rev… Modified: trunk/irc/TechBot/TechBot/ServiceThread.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot/ServiceThread.… Added: trunk/irc/TechBot/TechBot/Settings.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot/Settings.Desig… Added: trunk/irc/TechBot/TechBot/Settings.settings URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot/Settings.setti… Modified: trunk/irc/TechBot/TechBot/TechBot.csproj URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot/TechBot.csproj…

1 0

[hpoussin] 33585: Make eventlog RPC interface more compatible with MS Windows
by hpoussin＠svn.reactos.org 18 May '08

18 May '08

Author: hpoussin Date: Sun May 18 10:29:53 2008 New Revision: 33585 URL: http://svn.reactos.org/svn/reactos?rev=33585&view=rev Log: Make eventlog RPC interface more compatible with MS Windows Modified: trunk/reactos/base/services/eventlog/rpc.c trunk/reactos/dll/win32/advapi32/service/eventlog.c trunk/reactos/include/reactos/idl/eventlogrpc.idl Modified: trunk/reactos/base/services/eventlog/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/rpc… ============================================================================== --- trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] Sun May 18 10:29:53 2008 @@ -10,15 +10,6 @@ #include "eventlog.h" -#ifdef __GNUC__ -/* HACK as long as idl compiler doesn't support well PUNICODE_STRING args */ -#define PANSI_STRING LPSTR -#define PUNICODE_STRING LPWSTR -#define BINDING_HANDLE handle_t BindingHandle, -#else -#define BINDING_HANDLE -#endif - /* FUNCTIONS ****************************************************************/ DWORD STDCALL RpcThreadRoutine(LPVOID lpParameter) @@ -50,169 +41,168 @@ return 0; } -/* Function 0x00 */ + +/* Function 0 */ NTSTATUS ElfrClearELFW( - BINDING_HANDLE - /* [in] */ LOGHANDLE Handle, - /* [in] */ PUNICODE_STRING BackupName) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -/* Function 0x01 */ + handle_t BindingHandle, + IELF_HANDLE LogHandle, + PRPC_UNICODE_STRING BackupFileName) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 1 */ NTSTATUS ElfrBackupELFW( - BINDING_HANDLE - /* [in] */ LOGHANDLE Handle, - /* [in] */ PUNICODE_STRING BackupName) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - - -/* Function 0x02 */ + handle_t BindingHandle, + IELF_HANDLE LogHandle, + PRPC_UNICODE_STRING BackupFileName) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 2 */ NTSTATUS ElfrCloseEL( - BINDING_HANDLE - /* [out][in] */ PLOGHANDLE Handle) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - - -/* Function 0x03 */ + handle_t BindingHandle, + IELF_HANDLE *LogHandle) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 3 */ NTSTATUS ElfrDeregisterEventSource( - BINDING_HANDLE - /* [out][in] */ PLOGHANDLE Handle) + handle_t BindingHandle, + IELF_HANDLE *LogHandle) { UNIMPLEMENTED; return STATUS_SUCCESS; } -/* Function 0x04 */ +/* Function 4 */ NTSTATUS ElfrNumberOfRecords( - BINDING_HANDLE - /* [in] */ LOGHANDLE Handle, - /* [out] */ long __RPC_FAR * NumberOfRecords) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - - -/* Function 0x05 */ + handle_t BindingHandle, + IELF_HANDLE LogHandle, + DWORD *NumberOfRecords) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 5 */ NTSTATUS ElfrOldestRecord( - BINDING_HANDLE - /* [in] */ LOGHANDLE LogHandle, - /* [out] */ long __RPC_FAR * OldestRecNumber) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - - -/* Function 0x06 */ -NTSTATUS ElfrChangeNotify(void) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - - -/* Function 0x07 */ + handle_t BindingHandle, + IELF_HANDLE LogHandle, + DWORD *OldestRecordNumber) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 6 */ +NTSTATUS ElfrChangeNotify( + handle_t BindingHandle, + IELF_HANDLE *LogHandle, + RPC_CLIENT_ID ClientId, + DWORD Event) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 7 */ NTSTATUS ElfrOpenELW( - BINDING_HANDLE - /* [unique][in] */ LPWSTR ServerName, - /* [in] */ PUNICODE_STRING FileName, - /* [in] */ PUNICODE_STRING NullStr, - /* [in] */ long MajorVer, - /* [in] */ long MinorVer, - /* [out] */ PLOGHANDLE Handle) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - - -/* Function 0x08 */ + handle_t BindingHandle, + EVENTLOG_HANDLE_W UNCServerName, + PRPC_UNICODE_STRING ModuleName, + PRPC_UNICODE_STRING RegModuleName, + DWORD MajorVersion, + DWORD MinorVersion, + IELF_HANDLE *LogHandle) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 8 */ NTSTATUS ElfrRegisterEventSourceW( - BINDING_HANDLE - /* [unique][in] */ LPWSTR ServerName, - /* [in] */ PUNICODE_STRING LogName, - /* [in] */ PUNICODE_STRING NullStr, - /* [in] */ long MajorVer, - /* [in] */ long MinorVer, - /* [out] */ PLOGHANDLE Handle) -{ - UNIMPLEMENTED; - *Handle = 1; + handle_t BindingHandle, + EVENTLOG_HANDLE_W UNCServerName, + PRPC_UNICODE_STRING ModuleName, + PRPC_UNICODE_STRING RegModuleName, + DWORD MajorVersion, + DWORD MinorVersion, + IELF_HANDLE *LogHandle) +{ + UNIMPLEMENTED; + *LogHandle = 1; return STATUS_SUCCESS; } -/* Function 0x09 */ +/* Function 9 */ NTSTATUS ElfrOpenBELW( - BINDING_HANDLE - /* [unique][in] */ LPWSTR ServerName, - /* [in] */ PUNICODE_STRING BackupName, - /* [in] */ long MajorVer, - /* [in] */ long MinorVer, - /* [out] */ PLOGHANDLE Handle) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - - -/* Function 0x0a */ + handle_t BindingHandle, + EVENTLOG_HANDLE_W UNCServerName, + PRPC_UNICODE_STRING BackupFileName, + DWORD MajorVersion, + DWORD MinorVersion, + IELF_HANDLE *LogHandle) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 10 */ NTSTATUS ElfrReadELW( - BINDING_HANDLE - /* [in] */ LOGHANDLE Handle, - /* [in] */ long Flags, - /* [in] */ long Offset, - /* [in] */ long BufSize, - /* [size_is][out] */unsigned char __RPC_FAR * Buffer, - /* [out] */ long __RPC_FAR * BytesRead, - /* [out] */ long __RPC_FAR * BytesNeeded) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - - -/* Function 0x0b */ + handle_t BindingHandle, + IELF_HANDLE LogHandle, + DWORD ReadFlags, + DWORD RecordOffset, + RULONG NumberOfBytesToRead, + BYTE *Buffer, + DWORD *NumberOfBytesRead, + DWORD *MinNumberOfBytesNeeded) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 11 */ NTSTATUS ElfrReportEventW( - BINDING_HANDLE - /* [in] */ LOGHANDLE Handle, - /* [in] */ long Time, - /* [in] */ short Type, - /* [in] */ short Category, - /* [in] */ long ID, - /* [in] */ short NumStrings, - /* [in] */ long DataSize, - /* [in] */ PUNICODE_STRING ComputerName, - /* [unique][in] */ unsigned char __RPC_FAR * SID, - /* [unique][size_is][in] */ PUNICODE_STRING __RPC_FAR Strings[], - /* [unique][size_is][in] */ unsigned char __RPC_FAR * Data, - /* [in] */ short Flags, - /* [unique][out][in] */ long __RPC_FAR * unknown1, - /* [unique][out][in] */ long __RPC_FAR * unknown2) -{ - short i; + handle_t BindingHandle, + IELF_HANDLE LogHandle, + DWORD Time, + USHORT EventType, + USHORT EventCategory, + DWORD EventID, + USHORT NumStrings, + DWORD DataSize, + PRPC_UNICODE_STRING ComputerName, + PRPC_SID UserSID, + PRPC_UNICODE_STRING Strings[], + BYTE *Data, + USHORT Flags, + DWORD *RecordNumber, + DWORD *TimeWritten) +{ + USHORT i; /* partial stub */ - - if (NumStrings == 0) - return STATUS_SUCCESS; - - if (Strings == NULL) - return STATUS_SUCCESS; - for (i = 0; i < NumStrings; i++) { - switch (Type) + switch (EventType) { case EVENTLOG_SUCCESS: DPRINT1("Success: %S\n", Strings[i]); @@ -231,7 +221,7 @@ break; default: - DPRINT1("Type %hu: %S\n", Type, Strings[i]); + DPRINT1("Type %hu: %S\n", EventType, Strings[i]); break; } } @@ -240,184 +230,236 @@ } -/* Function 0x0c */ +/* Function 12 */ NTSTATUS ElfrClearELFA( - BINDING_HANDLE - /* [in] */ LOGHANDLE Handle, - /* [unique][in] */ PANSI_STRING BackupName) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - - -/* Function 0x0d */ + handle_t BindingHandle, + IELF_HANDLE LogHandle, + PRPC_STRING BackupFileName) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 13 */ NTSTATUS ElfrBackupELFA( - BINDING_HANDLE - /* [in] */ LOGHANDLE Handle, - /* [in] */ PANSI_STRING BackupName) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - - -/* Function 0x0e */ + handle_t BindingHandle, + IELF_HANDLE LogHandle, + PRPC_STRING BackupFileName) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 14 */ NTSTATUS ElfrOpenELA( - BINDING_HANDLE - /* [unique][in] */ LPSTR ServerName, - /* [in] */ PANSI_STRING LogName, - /* [in] */ PANSI_STRING NullStr, - /* [in] */ long MajorVer, - /* [in] */ long MinorVer, - /* [out] */ PLOGHANDLE Handle) -{ - UNICODE_STRING logname = { 0, }, servername = { 0, }, StrNull = { 0, }; - NTSTATUS status; - - if (LogName && !RtlCreateUnicodeStringFromAsciiz(&logname, LogName)) + handle_t BindingHandle, + EVENTLOG_HANDLE_A UNCServerName, + PRPC_STRING ModuleName, + PRPC_STRING RegModuleName, + DWORD MajorVersion, + DWORD MinorVersion, + IELF_HANDLE *LogHandle) +{ + UNICODE_STRING UNCServerNameW = { 0, }; + UNICODE_STRING ModuleNameW = { 0, }; + UNICODE_STRING RegModuleNameW = { 0, }; + NTSTATUS Status; + + if (UNCServerName && + !RtlCreateUnicodeStringFromAsciiz(&UNCServerNameW, UNCServerName)) { return STATUS_NO_MEMORY; } - if (ServerName && - !RtlCreateUnicodeStringFromAsciiz(&servername, ServerName)) - { - RtlFreeUnicodeString(&logname); + if (ModuleName && + !RtlAnsiStringToUnicodeString(&ModuleNameW, (PANSI_STRING)ModuleName, TRUE)) + { + RtlFreeUnicodeString(&UNCServerNameW); return STATUS_NO_MEMORY; } - status = ElfrOpenELW(BindingHandle, servername.Buffer, logname.Buffer, - StrNull.Buffer, MajorVer, MinorVer, Handle); - - RtlFreeUnicodeString(&servername); - RtlFreeUnicodeString(&logname); - - return status; -} - - -/* Function 0x0f */ + if (RegModuleName && + !RtlAnsiStringToUnicodeString(&RegModuleNameW, (PANSI_STRING)RegModuleName, TRUE)) + { + RtlFreeUnicodeString(&UNCServerNameW); + RtlFreeUnicodeString(&ModuleNameW); + return STATUS_NO_MEMORY; + } + + Status = ElfrOpenELW( + BindingHandle, + UNCServerName ? UNCServerNameW.Buffer : NULL, + ModuleName ? (PRPC_UNICODE_STRING)&ModuleNameW : NULL, + RegModuleName ? (PRPC_UNICODE_STRING)&RegModuleNameW : NULL, + MajorVersion, + MinorVersion, + LogHandle); + + RtlFreeUnicodeString(&UNCServerNameW); + RtlFreeUnicodeString(&ModuleNameW); + RtlFreeUnicodeString(&RegModuleNameW); + + return Status; +} + + +/* Function 15 */ NTSTATUS ElfrRegisterEventSourceA( - BINDING_HANDLE - /* [unique][in] */ LPSTR ServerName, - /* [in] */ PANSI_STRING LogName, - /* [in] */ PANSI_STRING NullStr, - /* [in] */ long MajorVer, - /* [in] */ long MinorVer, - /* [out] */ PLOGHANDLE Handle) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - - -/* Function 0x10 */ + handle_t BindingHandle, + EVENTLOG_HANDLE_A UNCServerName, + PRPC_STRING ModuleName, + PRPC_STRING RegModuleName, + DWORD MajorVersion, + DWORD MinorVersion, + IELF_HANDLE *LogHandle) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 16 */ NTSTATUS ElfrOpenBELA( - BINDING_HANDLE - /* [unique][in] */ LPSTR ServerName, - /* [in] */ PANSI_STRING BakckupName, - /* [in] */ long MajorVer, - /* [in] */ long MinorVer, - /* [out] */ PLOGHANDLE Handle) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - - -/* Function 0x11 */ + handle_t BindingHandle, + EVENTLOG_HANDLE_A UNCServerName, + PRPC_STRING BackupFileName, + DWORD MajorVersion, + DWORD MinorVersion, + IELF_HANDLE *LogHandle) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 17 */ NTSTATUS ElfrReadELA( - BINDING_HANDLE - /* [in] */ LOGHANDLE Handle, - /* [in] */ long Flags, - /* [in] */ long Offset, - /* [in] */ long BufSize, - /* [size_is][out] */unsigned char __RPC_FAR * Buffer, - /* [out] */ long __RPC_FAR * BytesRead, - /* [out] */ long __RPC_FAR * BytesNeeded) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - - -/* Function 0x12 */ + handle_t BindingHandle, + IELF_HANDLE LogHandle, + DWORD ReadFlags, + DWORD RecordOffset, + RULONG NumberOfBytesToRead, + BYTE *Buffer, + DWORD *NumberOfBytesRead, + DWORD *MinNumberOfBytesNeeded) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 18 */ NTSTATUS ElfrReportEventA( - BINDING_HANDLE - /* [in] */ LOGHANDLE Handle, - /* [in] */ long Time, - /* [in] */ short Type, - /* [in] */ short Category, - /* [in] */ long ID, - /* [in] */ short NumStrings, - /* [in] */ long DataSize, - /* [in] */ PANSI_STRING ComputerName, - /* [unique][in] */ unsigned char __RPC_FAR * SID, - /* [unique][size_is][in] */ PANSI_STRING __RPC_FAR Strings[], - /* [unique][size_is][in] */ unsigned char __RPC_FAR * Data, - /* [in] */ short Flags, - /* [unique][out][in] */ long __RPC_FAR * unknown1, - /* [unique][out][in] */ long __RPC_FAR * unknown2) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - - -/* Function 0x13 */ -NTSTATUS ElfrRegisterClusterSvc(void) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - - -/* Function 0x14 */ -NTSTATUS ElfrDeregisterClusterSvc(void) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - - -/* Function 0x15 */ -NTSTATUS ElfrWriteClusterEvents(void) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - - -/* Function 0x16 */ + handle_t BindingHandle, + IELF_HANDLE LogHandle, + DWORD Time, + USHORT EventType, + USHORT EventCategory, + DWORD EventID, + USHORT NumStrings, + DWORD DataSize, + PRPC_STRING ComputerName, + PRPC_SID UserSID, + PRPC_STRING Strings[], + BYTE *Data, + USHORT Flags, + DWORD *RecordNumber, + DWORD *TimeWritten) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 19 */ +NTSTATUS ElfrRegisterClusterSvc( + handle_t BindingHandle) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 20 */ +NTSTATUS ElfrDeregisterClusterSvc( + handle_t BindingHandle) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 21 */ +NTSTATUS ElfrWriteClusterEvents( + handle_t BindingHandle) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 22 */ NTSTATUS ElfrGetLogInformation( - BINDING_HANDLE - /* [in] */ LOGHANDLE Handle, - /* [in] */ long InfoLevel, - /* [size_is][out] */unsigned char __RPC_FAR * Buffer, - /* [in] */ long BufSize, - /* [out] */ long __RPC_FAR * BytesNeeded) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - - -/* Function 0x17 */ + handle_t BindingHandle, + IELF_HANDLE LogHandle, + DWORD InfoLevel, + BYTE *Buffer, + DWORD cbBufSize, + DWORD *pcbBytesNeeded) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 23 */ NTSTATUS ElfrFlushEL( - BINDING_HANDLE - /* [in] */ LOGHANDLE Handle) -{ - DbgPrint("EventLogFlush UNIMPLEMENTED\n"); - return STATUS_NOT_IMPLEMENTED; -} + handle_t BindingHandle, + IELF_HANDLE LogHandle) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 24 */ +NTSTATUS ElfrReportEventAndSourceW( + handle_t BindingHandle, + IELF_HANDLE LogHandle, + DWORD Time, + USHORT EventType, + USHORT EventCategory, + ULONG EventID, + PRPC_UNICODE_STRING SourceName, + USHORT NumStrings, + DWORD DataSize, + PRPC_UNICODE_STRING ComputerName, + PRPC_SID UserSID, + PRPC_UNICODE_STRING Strings[], + BYTE *Data, + USHORT Flags, + DWORD *RecordNumber, + DWORD *TimeWritten) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + void __RPC_FAR *__RPC_USER midl_user_allocate(size_t len) { return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); } + void __RPC_USER midl_user_free(void __RPC_FAR * ptr) { HeapFree(GetProcessHeap(), 0, ptr); } + + +void __RPC_USER IELF_HANDLE_rundown(IELF_HANDLE LogHandle) +{ +} Modified: trunk/reactos/dll/win32/advapi32/service/eventlog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/eventlog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/eventlog.c [iso-8859-1] Sun May 18 10:29:53 2008 @@ -30,7 +30,7 @@ typedef struct _LOG_INFO { RPC_BINDING_HANDLE BindingHandle; - LOGHANDLE LogHandle; + IELF_HANDLE LogHandle; BOOL bLocal; } LOG_INFO, *PLOG_INFO; @@ -44,11 +44,13 @@ { PLOG_INFO pLog; NTSTATUS Status; - ANSI_STRING BackupFileName; + RPC_STRING BackupFileName; TRACE("%p, %s\n", hEventLog, lpBackupFileName); - RtlInitAnsiString(&BackupFileName, lpBackupFileName); + BackupFileName.Buffer = (LPSTR)lpBackupFileName; + BackupFileName.Length = BackupFileName.MaximumLength = + lpBackupFileName ? strlen(lpBackupFileName) : 0; pLog = (PLOG_INFO)hEventLog; if (!pLog) @@ -59,7 +61,7 @@ Status = ElfrBackupELFA( pLog->BindingHandle, pLog->LogHandle, - BackupFileName.Buffer); + &BackupFileName); if (!NT_SUCCESS(Status)) { @@ -83,11 +85,51 @@ { PLOG_INFO pLog; NTSTATUS Status; - UNICODE_STRING BackupFileName; + RPC_UNICODE_STRING BackupFileName; + + TRACE("%p, %s\n", hEventLog, debugstr_w(lpBackupFileName)); + + BackupFileName.Buffer = (LPWSTR)lpBackupFileName; + BackupFileName.Length = BackupFileName.MaximumLength = + lpBackupFileName ? wcslen(lpBackupFileName) * sizeof(WCHAR) : 0; + + pLog = (PLOG_INFO)hEventLog; + if (!pLog) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + Status = ElfrBackupELFW( + pLog->BindingHandle, + pLog->LogHandle, + &BackupFileName); + + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + return TRUE; +} + + +/****************************************************************************** + * ClearEventLogA [ADVAPI32.@] + */ +BOOL WINAPI +ClearEventLogA( + IN HANDLE hEventLog, + IN LPCSTR lpBackupFileName) +{ + PLOG_INFO pLog; + NTSTATUS Status; + RPC_STRING BackupFileName; TRACE("%p, %s\n", hEventLog, lpBackupFileName); - RtlInitUnicodeString(&BackupFileName, lpBackupFileName); + BackupFileName.Buffer = (LPSTR)lpBackupFileName; + BackupFileName.Length = BackupFileName.MaximumLength = + lpBackupFileName ? strlen(lpBackupFileName) : 0; pLog = (PLOG_INFO)hEventLog; if (!pLog) @@ -95,35 +137,37 @@ SetLastError(ERROR_INVALID_HANDLE); return FALSE; } - Status = ElfrBackupELFW( + Status = ElfrClearELFA( pLog->BindingHandle, pLog->LogHandle, - BackupFileName.Buffer); - - if (!NT_SUCCESS(Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - return TRUE; -} - - -/****************************************************************************** - * ClearEventLogA [ADVAPI32.@] - */ -BOOL WINAPI -ClearEventLogA( - IN HANDLE hEventLog, - IN LPCSTR lpBackupFileName) -{ - PLOG_INFO pLog; - NTSTATUS Status; - ANSI_STRING BackupFileName; - - TRACE("%p, %s\n", hEventLog, lpBackupFileName); - - RtlInitAnsiString(&BackupFileName, lpBackupFileName); + &BackupFileName); + + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + return TRUE; +} + + +/****************************************************************************** + * ClearEventLogW [ADVAPI32.@] + */ +BOOL WINAPI +ClearEventLogW( + IN HANDLE hEventLog, + IN LPCWSTR lpBackupFileName) +{ + PLOG_INFO pLog; + NTSTATUS Status; + RPC_UNICODE_STRING BackupFileName; + + TRACE("%p, %s\n", hEventLog, debugstr_w(lpBackupFileName)); + + BackupFileName.Buffer = (LPWSTR)lpBackupFileName; + BackupFileName.Length = BackupFileName.MaximumLength = + lpBackupFileName ? wcslen(lpBackupFileName) * sizeof(WCHAR) : 0; pLog = (PLOG_INFO)hEventLog; if (!pLog) @@ -131,46 +175,10 @@ SetLastError(ERROR_INVALID_HANDLE); return FALSE; } - Status = ElfrClearELFA( + Status = ElfrClearELFW( pLog->BindingHandle, pLog->LogHandle, - BackupFileName.Buffer); - - if (!NT_SUCCESS(Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - return TRUE; -} - - -/****************************************************************************** - * ClearEventLogW [ADVAPI32.@] - */ -BOOL WINAPI -ClearEventLogW( - IN HANDLE hEventLog, - IN LPCWSTR lpBackupFileName) -{ - PLOG_INFO pLog; - NTSTATUS Status; - UNICODE_STRING BackupFileName; - - TRACE("%p, %s\n", hEventLog, lpBackupFileName); - - RtlInitUnicodeString(&BackupFileName, lpBackupFileName); - - pLog = (PLOG_INFO)hEventLog; - if (!pLog) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - Status = ElfrClearELFW( - pLog->BindingHandle, - pLog->LogHandle, - BackupFileName.Buffer); + &BackupFileName); if (!NT_SUCCESS(Status)) { @@ -191,7 +199,7 @@ PLOG_INFO pLog; NTSTATUS Status; - TRACE("%p", hEventLog); + TRACE("%p\n", hEventLog); pLog = (PLOG_INFO)hEventLog; if (!pLog) @@ -271,7 +279,7 @@ { PLOG_INFO pLog; NTSTATUS Status; - long Records; + DWORD Records; TRACE("%p, %p\n", hEventLog, NumberOfRecords); @@ -310,7 +318,7 @@ { PLOG_INFO pLog; NTSTATUS Status; - long Oldest; + DWORD Oldest; TRACE("%p, %p\n", hEventLog, OldestRecord); @@ -405,13 +413,13 @@ { PLOG_INFO pLog; NTSTATUS Status; - UNICODE_STRING UNCServerName; - UNICODE_STRING FileName; - - TRACE("%s, %s\n", lpUNCServerName, lpFileName); - - RtlInitUnicodeString(&UNCServerName, lpUNCServerName); - RtlInitUnicodeString(&FileName, lpFileName); + RPC_UNICODE_STRING FileName; + + TRACE("%s, %s\n", debugstr_w(lpUNCServerName), debugstr_w(lpFileName)); + + FileName.Buffer = (LPWSTR)lpFileName; + FileName.Length = FileName.MaximumLength = + lpFileName ? wcslen(lpFileName) * sizeof(WCHAR) : 0; pLog = HeapAlloc(GetProcessHeap(), 0, sizeof(LOG_INFO)); if (!pLog) @@ -446,8 +454,8 @@ Status = ElfrOpenBELW( pLog->BindingHandle, - UNCServerName.Buffer, - FileName.Buffer, + (LPWSTR)lpUNCServerName, + &FileName, 0, 0, &pLog->LogHandle); @@ -509,13 +517,13 @@ { PLOG_INFO pLog; NTSTATUS Status; - UNICODE_STRING UNCServerName; - UNICODE_STRING SourceName; - - TRACE("%s, %s\n", lpUNCServerName, lpSourceName); - - RtlInitUnicodeString(&UNCServerName, lpUNCServerName); - RtlInitUnicodeString(&SourceName, lpSourceName); + RPC_UNICODE_STRING SourceName; + + TRACE("%s, %s\n", debugstr_w(lpUNCServerName), debugstr_w(lpSourceName)); + + SourceName.Buffer = (LPWSTR)lpSourceName; + SourceName.Length = SourceName.MaximumLength = + lpSourceName ? wcslen(lpSourceName) * sizeof(WCHAR) : 0; pLog = HeapAlloc(GetProcessHeap(), 0, sizeof(LOG_INFO)); if (!pLog) @@ -550,8 +558,8 @@ Status = ElfrOpenELW( pLog->BindingHandle, - UNCServerName.Buffer, - SourceName.Buffer, + (LPWSTR)lpUNCServerName, + &SourceName, NULL, 0, 0, @@ -582,7 +590,7 @@ { PLOG_INFO pLog; NTSTATUS Status; - long bytesRead, minNumberOfBytesNeeded; + DWORD bytesRead, minNumberOfBytesNeeded; TRACE("%p, %lu, %lu, %p, %lu, %p, %p\n", hEventLog, dwReadFlags, dwRecordOffset, lpBuffer, @@ -639,7 +647,7 @@ { PLOG_INFO pLog; NTSTATUS Status; - long bytesRead, minNumberOfBytesNeeded; + DWORD bytesRead, minNumberOfBytesNeeded; TRACE("%p, %lu, %lu, %p, %lu, %p, %p\n", hEventLog, dwReadFlags, dwRecordOffset, lpBuffer, @@ -726,13 +734,13 @@ { PLOG_INFO pLog; NTSTATUS Status; - UNICODE_STRING UNCServerName; - UNICODE_STRING SourceName; - - TRACE("%s, %s\n", lpUNCServerName, lpSourceName); - - RtlInitUnicodeString(&UNCServerName, lpUNCServerName); - RtlInitUnicodeString(&SourceName, lpSourceName); + RPC_UNICODE_STRING SourceName; + + TRACE("%s, %s\n", debugstr_w(lpUNCServerName), debugstr_w(lpSourceName)); + + SourceName.Buffer = (LPWSTR)lpSourceName; + SourceName.Length = SourceName.MaximumLength = + lpSourceName ? wcslen(lpSourceName) * sizeof(WCHAR) : 0; pLog = HeapAlloc(GetProcessHeap(), 0, sizeof(LOG_INFO)); if (!pLog) @@ -767,9 +775,9 @@ Status = ElfrRegisterEventSourceW( pLog->BindingHandle, - UNCServerName.Buffer, - SourceName.Buffer, - L"", + (LPWSTR)lpUNCServerName, + &SourceName, + NULL, 0, 0, &pLog->LogHandle); Modified: trunk/reactos/include/reactos/idl/eventlogrpc.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/eventl… ============================================================================== --- trunk/reactos/include/reactos/idl/eventlogrpc.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/eventlogrpc.idl [iso-8859-1] Sun May 18 10:29:53 2008 @@ -1,306 +1,307 @@ /* - * Copyright 2005 Saveliy Tretiakov - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Event Log RPC interface definition */ +#include <ms-dtyp.idl> + +cpp_quote("#if !defined(__EVENTLOG_H__) && !defined(__ADVAPI32_H)") +typedef long NTSTATUS; +cpp_quote("#endif") + +#define MAX_BATCH_BUFF 0x0007FFFF + +typedef [range(0, MAX_BATCH_BUFF)] unsigned long RULONG; +typedef struct _RPC_STRING { + USHORT Length; + USHORT MaximumLength; + [size_is(MaximumLength), length_is(Length)] LPSTR Buffer; +} RPC_STRING, *PRPC_STRING; + +typedef [context_handle] unsigned long IELF_HANDLE; +typedef IELF_HANDLE *PIELF_HANDLE; +typedef [handle, unique] LPWSTR EVENTLOG_HANDLE_W; +typedef [handle, unique] LPSTR EVENTLOG_HANDLE_A; + +typedef struct _RPC_CLIENT_ID { + DWORD UniqueProcess; + DWORD UniqueThread; +} RPC_CLIENT_ID, *PRPC_CLIENT_ID; + [ - uuid(82273FDC-E32A-18C3-3F78-827929DC23EA), - version(0.0), - pointer_default(unique) -#ifndef __midl - ,explicit_handle + uuid(82273FDC-E32A-18C3-3F78-827929DC23EA), + version(0.0), + pointer_default(unique) +#ifndef __midl + ,explicit_handle #endif ] interface eventlog { - cpp_quote("#if 0") -#ifdef __midl - typedef [handle, unique] wchar_t *LPWSTR; - typedef [handle, unique] char *LPSTR; - typedef unsigned int NTSTATUS; -#else - #define LPWSTR wchar_t * - #define LPSTR char * - #define NTSTATUS long -#endif - -#ifdef __midl - typedef struct _UNICODE_STRING { - unsigned short Length; - unsigned short MaximumLength; - [size_is(MaximumLength/2), unique] wchar_t *Buffer; - } UNICODE_STRING, *PUNICODE_STRING; - - typedef struct _ANSI_STRING { - unsigned short Length; - unsigned short MaximumLength; - [size_is(MaximumLength), unique] char *Buffer; - } ANSI_STRING, *PANSI_STRING; -#else - #define PUNICODE_STRING wchar_t * - #define PANSI_STRING char * -#endif - cpp_quote("#endif") - -#ifdef __midl - typedef [context_handle] struct _LOGHANDLE { - int pos; - } *LOGHANDLE; - typedef LOGHANDLE *PLOGHANDLE; -#else - #define LOGHANDLE unsigned int - #define PLOGHANDLE unsigned int* - cpp_quote("typedef unsigned int LOGHANDLE, *PLOGHANDLE;") -#endif - - /* Function 0x00 */ - NTSTATUS ElfrClearELFW( -#ifndef __midl - handle_t BindingHandle, -#endif - [in] LOGHANDLE Handle, - [in] PUNICODE_STRING BackupName); - - /* Function 0x01 */ - NTSTATUS ElfrBackupELFW( -#ifndef __midl - handle_t BindingHandle, -#endif - [in] LOGHANDLE Handle, - [in] PUNICODE_STRING BackupName); - - /* Function 0x02 */ - NTSTATUS ElfrCloseEL( -#ifndef __midl - handle_t BindingHandle, -#endif - [in,out] PLOGHANDLE Handle); - - /* Function 0x03 */ - NTSTATUS ElfrDeregisterEventSource( -#ifndef __midl - handle_t BindingHandle, -#endif - [in,out] PLOGHANDLE Handle); - - /* Function 0x04 */ - NTSTATUS ElfrNumberOfRecords( -#ifndef __midl - handle_t BindingHandle, -#endif - [in] LOGHANDLE Handle, - [out] long *NumberOfRecords); - - /* Function 0x05 */ - NTSTATUS ElfrOldestRecord( -#ifndef __midl - handle_t BindingHandle, -#endif - [in] LOGHANDLE LogHandle, - [out] long *OldestRecNumber); - - /* Function 0x06 */ - //NTSTATUS ElfrChangeNotify(); // FIXME - - /* Function 0x07 */ - NTSTATUS ElfrOpenELW( -#ifndef __midl - handle_t BindingHandle, -#endif - [in, unique] LPWSTR ServerName, - [in] PUNICODE_STRING FileName, - [in] PUNICODE_STRING NullStr, - [in] long MajorVer, - [in] long MinorVer, - [out] PLOGHANDLE Handle ); - - /* Function 0x08 */ - NTSTATUS ElfrRegisterEventSourceW( -#ifndef __midl - handle_t BindingHandle, -#endif - [in, unique] LPWSTR ServerName, - [in] PUNICODE_STRING LogName, - [in] PUNICODE_STRING NullStr, - [in] long MajorVer, - [in] long MinorVer, - [out] PLOGHANDLE Handle); - - /* Function 0x09 */ - NTSTATUS ElfrOpenBELW( -#ifndef __midl - handle_t BindingHandle, -#endif - [in, unique] LPWSTR ServerName, - [in] PUNICODE_STRING BackupName, - [in] long MajorVer, - [in] long MinorVer, - [out] PLOGHANDLE Handle); - - /* Function 0x0a */ - NTSTATUS ElfrReadELW( -#ifndef __midl - handle_t BindingHandle, -#endif - [in] LOGHANDLE Handle, - [in] long Flags, - [in] long Offset, - [in] long BufSize, - [out,size_is(BufSize)] unsigned char *Buffer, - [out] long *BytesRead, - [out] long *BytesNeeded); - - /* Function 0x0b */ - NTSTATUS ElfrReportEventW( -#ifndef __midl - handle_t BindingHandle, -#endif - [in] LOGHANDLE Handle, - [in] long Time, - [in] short Type, - [in] short Category, - [in] long ID, - [in] short NumStrings, - [in] long DataSize, - [in] PUNICODE_STRING ComputerName, - [in, unique] unsigned char *SID, -#ifdef __midl - [in, size_is(NumStrings), unique] PUNICODE_STRING Strings[*], -#else - [in, size_is(NumStrings), unique] PUNICODE_STRING *Strings, -#endif - [in, size_is(DataSize), unique] unsigned char *Data, - [in] short Flags, - [in,out,unique] long *unknown1, - [in,out,unique] long *unknown2); - - /* Function 0x0c */ - NTSTATUS ElfrClearELFA( -#ifndef __midl - handle_t BindingHandle, -#endif - [in] LOGHANDLE Handle, - [in,unique] PANSI_STRING BackupName); - - /* Function 0x0d */ - NTSTATUS ElfrBackupELFA( -#ifndef __midl - handle_t BindingHandle, -#endif - [in] LOGHANDLE Handle, - [in] PANSI_STRING BackupName); - - /* Function 0x0e */ - NTSTATUS ElfrOpenELA( -#ifndef __midl - handle_t BindingHandle, -#endif - [in, unique] LPSTR ServerName, - [in] PANSI_STRING LogName, - [in] PANSI_STRING NullStr, - [in] long MajorVer, - [in] long MinorVer, - [out] PLOGHANDLE Handle); - - /* Function 0x0f */ - NTSTATUS ElfrRegisterEventSourceA( -#ifndef __midl - handle_t BindingHandle, -#endif - [in, unique] LPSTR ServerName, - [in] PANSI_STRING LogName, - [in] PANSI_STRING NullStr, - [in] long MajorVer, - [in] long MinorVer, - [out] PLOGHANDLE Handle); - - /* Function 0x10 */ - NTSTATUS ElfrOpenBELA( -#ifndef __midl - handle_t BindingHandle, -#endif - [in, unique] LPSTR ServerName, - [in] PANSI_STRING BakckupName, - [in] long MajorVer, - [in] long MinorVer, - [out] PLOGHANDLE Handle); - - /* Function 0x11 */ - NTSTATUS ElfrReadELA( -#ifndef __midl - handle_t BindingHandle, -#endif - [in] LOGHANDLE Handle, - [in] long Flags, - [in] long Offset, - [in] long BufSize, - [out,size_is(BufSize)] unsigned char *Buffer, - [out] long *BytesRead, - [out] long *BytesNeeded); - - /* Function 0x12 */ - NTSTATUS ElfrReportEventA( -#ifndef __midl - handle_t BindingHandle, -#endif - [in] LOGHANDLE Handle, - [in] long Time, - [in] short Type, - [in] short Category, - [in] long ID, - [in] short NumStrings, - [in] long DataSize, - [in] PANSI_STRING ComputerName, - [in, unique] unsigned char *SID, -#ifdef __midl - [in, size_is(NumStrings), unique] PANSI_STRING Strings[*], -#else - [in, size_is(NumStrings), unique] PANSI_STRING *Strings, -#endif - [in, size_is(DataSize), unique] unsigned char *Data, - [in] short Flags, - [in,out,unique] long *unknown1, - [in,out,unique] long *unknown2); - - /* Function 0x13 */ - //NTSTATUS ElfrRegisterClusterSvc(); //FIXME - - /* Function 0x14 */ - //NTSTATUS ElfrDeregisterClusterSvc(); //FIXME - - /* Function 0x15 */ - //NTSTATUS ElfrWriteClusterEvents(); //FIXME - - /* Function 0x16 */ - NTSTATUS ElfrGetLogInformation( -#ifndef __midl - handle_t BindingHandle, -#endif - [in] LOGHANDLE Handle, - [in] long InfoLevel, - [out, size_is(BufSize)] unsigned char *Buffer, - [in] long BufSize, - [out] long *BytesNeeded); - - /* Function 0x17 */ - NTSTATUS ElfrFlushEL( -#ifndef __midl - handle_t BindingHandle, -#endif - [in] LOGHANDLE Handle); - + /* Function 0 */ + NTSTATUS ElfrClearELFW( +#ifndef __midl + [in] handle_t BindingHandle, +#endif + [in] IELF_HANDLE LogHandle, + [in, unique] PRPC_UNICODE_STRING BackupFileName); + + /* Function 1 */ + NTSTATUS ElfrBackupELFW( +#ifndef __midl + [in] handle_t BindingHandle, +#endif + [in] IELF_HANDLE LogHandle, + [in, unique] PRPC_UNICODE_STRING BackupFileName); + + /* Function 2 */ + NTSTATUS ElfrCloseEL( +#ifndef __midl + [in] handle_t BindingHandle, +#endif + [in, out] IELF_HANDLE *LogHandle); + + /* Function 3 */ + NTSTATUS ElfrDeregisterEventSource( +#ifndef __midl + [in] handle_t BindingHandle, +#endif + [in, out] IELF_HANDLE *LogHandle); + + /* Function 4 */ + NTSTATUS ElfrNumberOfRecords( +#ifndef __midl + [in] handle_t BindingHandle, +#endif + [in] IELF_HANDLE LogHandle, + [out] DWORD *NumberOfRecords); + + /* Function 5 */ + NTSTATUS ElfrOldestRecord( +#ifndef __midl + handle_t BindingHandle, +#endif + [in] IELF_HANDLE LogHandle, + [out] DWORD *OldestRecordNumber); + + /* Function 6 */ + NTSTATUS ElfrChangeNotify( +#ifndef __midl + [in] handle_t BindingHandle, +#endif + [in] IELF_HANDLE *LogHandle, + [in] RPC_CLIENT_ID ClientId, + [in] DWORD Event); + + /* Function 7 */ + NTSTATUS ElfrOpenELW( +#ifndef __midl + [in] handle_t BindingHandle, +#endif + [in] EVENTLOG_HANDLE_W UNCServerName, + [in] PRPC_UNICODE_STRING ModuleName, + [in] PRPC_UNICODE_STRING RegModuleName, + [in] DWORD MajorVersion, + [in] DWORD MinorVersion, + [out] IELF_HANDLE* LogHandle); + + /* Function 8 */ + NTSTATUS ElfrRegisterEventSourceW( +#ifndef __midl + [in] handle_t BindingHandle, +#endif + [in] EVENTLOG_HANDLE_W UNCServerName, + [in] PRPC_UNICODE_STRING ModuleName, + [in] PRPC_UNICODE_STRING RegModuleName, + [in] DWORD MajorVersion, + [in] DWORD MinorVersion, + [out] IELF_HANDLE* LogHandle); + + /* Function 9 */ + NTSTATUS ElfrOpenBELW( +#ifndef __midl + [in] handle_t BindingHandle, +#endif + [in] EVENTLOG_HANDLE_W UNCServerName, + [in] PRPC_UNICODE_STRING BackupFileName, + [in] DWORD MajorVersion, + [in] DWORD MinorVersion, + [out] IELF_HANDLE* LogHandle); + + /* Function 10 */ + NTSTATUS ElfrReadELW( +#ifndef __midl + [in] handle_t BindingHandle, +#endif + [in] IELF_HANDLE LogHandle, + [in] DWORD ReadFlags, + [in] DWORD RecordOffset, + [in] RULONG NumberOfBytesToRead, + [out, size_is(NumberOfBytesToRead)] BYTE *Buffer, + [out] DWORD *NumberOfBytesRead, + [out] DWORD *MinNumberOfBytesNeeded); + + /* Function 11 */ + NTSTATUS ElfrReportEventW( +#ifndef __midl + [in] handle_t BindingHandle, +#endif + [in] IELF_HANDLE LogHandle, + [in] DWORD Time, + [in] USHORT EventType, + [in] USHORT EventCategory, + [in] DWORD EventID, + [in, range(0, 256)] USHORT NumStrings, + [in, range(0, 61440)] DWORD DataSize, + [in] PRPC_UNICODE_STRING ComputerName, + [in, unique] PRPC_SID UserSID, + [in, size_is(NumStrings), unique] PRPC_UNICODE_STRING Strings[*], + [in, size_is(DataSize), unique] BYTE *Data, + [in] USHORT Flags, + [in, out, unique] DWORD *RecordNumber, + [in, out, unique] DWORD *TimeWritten); + + /* Function 12 */ + NTSTATUS ElfrClearELFA( +#ifndef __midl + [in] handle_t BindingHandle, +#endif + [in] IELF_HANDLE LogHandle, + [in, unique] PRPC_STRING BackupFileName); + + /* Function 13 */ + NTSTATUS ElfrBackupELFA( +#ifndef __midl + [in] handle_t BindingHandle, +#endif + [in] IELF_HANDLE LogHandle, + [in, unique] PRPC_STRING BackupFileName); + + /* Function 14 */ + NTSTATUS ElfrOpenELA( +#ifndef __midl + [in] handle_t BindingHandle, +#endif + [in] EVENTLOG_HANDLE_A UNCServerName, + [in] PRPC_STRING ModuleName, + [in] PRPC_STRING RegModuleName, + [in] DWORD MajorVersion, + [in] DWORD MinorVersion, + [out] IELF_HANDLE* LogHandle); + + /* Function 15 */ + NTSTATUS ElfrRegisterEventSourceA( +#ifndef __midl + [in] handle_t BindingHandle, +#endif + [in] EVENTLOG_HANDLE_A UNCServerName, + [in] PRPC_STRING ModuleName, + [in] PRPC_STRING RegModuleName, + [in] DWORD MajorVersion, + [in] DWORD MinorVersion, + [out] IELF_HANDLE* LogHandle); + + /* Function 16 */ + NTSTATUS ElfrOpenBELA( +#ifndef __midl + [in] handle_t BindingHandle, +#endif + [in] EVENTLOG_HANDLE_A UNCServerName, + [in] PRPC_STRING BackupFileName, + [in] DWORD MajorVersion, + [in] DWORD MinorVersion, + [out] IELF_HANDLE* LogHandle); + + /* Function 17 */ + NTSTATUS ElfrReadELA( +#ifndef __midl + [in] handle_t BindingHandle, +#endif + [in] IELF_HANDLE LogHandle, + [in] DWORD ReadFlags, + [in] DWORD RecordOffset, + [in] RULONG NumberOfBytesToRead, + [out, size_is(NumberOfBytesToRead)] BYTE *Buffer, + [out] DWORD *NumberOfBytesRead, + [out] DWORD *MinNumberOfBytesNeeded); + + /* Function 18 */ + NTSTATUS ElfrReportEventA( +#ifndef __midl + [in] handle_t BindingHandle, +#endif + [in] IELF_HANDLE LogHandle, + [in] DWORD Time, + [in] USHORT EventType, + [in] USHORT EventCategory, + [in] DWORD EventID, + [in, range(0, 256)] USHORT NumStrings, + [in, range(0, 61440)] DWORD DataSize, + [in] PRPC_STRING ComputerName, + [in, unique] PRPC_SID UserSID, + [in, size_is(NumStrings), unique] PRPC_STRING Strings[*], + [in, size_is(DataSize), unique] BYTE *Data, + [in] USHORT Flags, + [in, out, unique] DWORD *RecordNumber, + [in, out, unique] DWORD *TimeWritten); + + /* Function 19 */ + NTSTATUS ElfrRegisterClusterSvc( +#ifndef __midl + [in] handle_t BindingHandle +#endif + ); /* FIXME */ + + /* Function 20 */ + NTSTATUS ElfrDeregisterClusterSvc( +#ifndef __midl + [in] handle_t BindingHandle +#endif + ); /* FIXME */ + + /* Function 21 */ + NTSTATUS ElfrWriteClusterEvents( +#ifndef __midl + [in] handle_t BindingHandle +#endif + ); /* FIXME */ + + /* Function 22 */ + NTSTATUS ElfrGetLogInformation( +#ifndef __midl + [in] handle_t BindingHandle, +#endif + [in] IELF_HANDLE LogHandle, + [in] DWORD InfoLevel, + [out, size_is(cbBufSize)] BYTE *Buffer, + [in, range(0, 1024)] DWORD cbBufSize, + [out] DWORD *pcbBytesNeeded); + + /* Function 23 */ + NTSTATUS ElfrFlushEL( +#ifndef __midl + [in] handle_t BindingHandle, +#endif + [in] IELF_HANDLE LogHandle); + + /* Function 24 */ + NTSTATUS ElfrReportEventAndSourceW( +#ifndef __midl + [in] handle_t BindingHandle, +#endif + [in] IELF_HANDLE LogHandle, + [in] DWORD Time, + [in] USHORT EventType, + [in] USHORT EventCategory, + [in] ULONG EventID, + [in] PRPC_UNICODE_STRING SourceName, + [in, range(0, 256)] USHORT NumStrings, + [in, range(0, 61440)] DWORD DataSize, + [in] PRPC_UNICODE_STRING ComputerName, + [in, unique] PRPC_SID UserSID, + [in, size_is(NumStrings), unique] PRPC_UNICODE_STRING Strings[*], + [in, size_is(DataSize), unique] BYTE *Data, + [in] USHORT Flags, + [in, out, unique] DWORD *RecordNumber, + [in, out, unique] DWORD *TimeWritten); }

1 0

[hpoussin] 33584: Replace ERR() by WARN() on error codes which can be normal
by hpoussin＠svn.reactos.org 18 May '08

18 May '08

Author: hpoussin Date: Sun May 18 10:26:24 2008 New Revision: 33584 URL: http://svn.reactos.org/svn/reactos?rev=33584&view=rev Log: Replace ERR() by WARN() on error codes which can be normal Modified: trunk/reactos/dll/win32/advapi32/service/scm.c Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] Sun May 18 10:26:24 2008 @@ -1424,7 +1424,10 @@ (SC_RPC_HANDLE *)&hService); if (dwError != ERROR_SUCCESS) { - ERR("ROpenServiceW() failed (Error %lu)\n", dwError); + if (dwError == ERROR_SERVICE_DOES_NOT_EXIST) + WARN("ROpenServiceW() failed (Error %lu)\n", dwError); + else + ERR("ROpenServiceW() failed (Error %lu)\n", dwError); SetLastError(dwError); return NULL; } @@ -1524,7 +1527,10 @@ pcbBytesNeeded); if (dwError != ERROR_SUCCESS) { - ERR("RQueryServiceConfigW() failed (Error %lu)\n", dwError); + if (dwError == ERROR_INSUFFICIENT_BUFFER) + WARN("RQueryServiceConfigW() failed (Error %lu)\n", dwError); + else + ERR("RQueryServiceConfigW() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; }

1 0

[hpoussin] 33583: Fix build
by hpoussin＠svn.reactos.org 18 May '08

18 May '08

Author: hpoussin Date: Sun May 18 10:23:52 2008 New Revision: 33583 URL: http://svn.reactos.org/svn/reactos?rev=33583&view=rev Log: Fix build Modified: trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Sun May 18 10:23:52 2008 @@ -2597,7 +2597,7 @@ LPBOUNDED_DWORD_256K pcbBytesNeeded, LPBOUNDED_DWORD_256K lpServicesReturned, LPBOUNDED_DWORD_256K lpResumeIndex, - LPWSTR pszGroupName) + LPCWSTR pszGroupName) { UNIMPLEMENTED; return ERROR_CALL_NOT_IMPLEMENTED; @@ -2893,7 +2893,7 @@ LPBOUNDED_DWORD_256K pcbBytesNeeded, LPBOUNDED_DWORD_256K lpServicesReturned, LPBOUNDED_DWORD_256K lpResumeIndex, - LPSTR pszGroupName) + LPCSTR pszGroupName) { UNIMPLEMENTED; *pcbBytesNeeded = 0; @@ -2914,7 +2914,7 @@ LPBOUNDED_DWORD_256K pcbBytesNeeded, LPBOUNDED_DWORD_256K lpServicesReturned, LPBOUNDED_DWORD_256K lpResumeIndex, - LPWSTR pszGroupName) + LPCWSTR pszGroupName) { PMANAGER_HANDLE hManager; PSERVICE lpService;

1 0

[hpoussin] 33582: Add ms-dtyp.idl file, and use it
by hpoussin＠svn.reactos.org 18 May '08

18 May '08

Author: hpoussin Date: Sun May 18 10:17:12 2008 New Revision: 33582 URL: http://svn.reactos.org/svn/reactos?rev=33582&view=rev Log: Add ms-dtyp.idl file, and use it Added: trunk/reactos/include/reactos/idl/ms-dtyp.idl (with props) Modified: trunk/reactos/include/reactos/idl/idl.rbuild trunk/reactos/include/reactos/idl/pnp.idl trunk/reactos/include/reactos/idl/svcctl.idl Modified: trunk/reactos/include/reactos/idl/idl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/idl.rb… ============================================================================== --- trunk/reactos/include/reactos/idl/idl.rbuild [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/idl.rbuild [iso-8859-1] Sun May 18 10:17:12 2008 @@ -7,7 +7,7 @@ <module name="pnp_client" type="rpcclient"> <file>pnp.idl</file> </module> -<module name="scm_server" type="rpcserver"> +<module name="scm_server" type="rpcserver" allowwarnings="true"> <file>svcctl.idl</file> </module> <module name="scm_client" type="rpcclient"> @@ -19,7 +19,7 @@ <module name="eventlog_client" type="rpcclient" > <file>eventlogrpc.idl</file> </module> -<module name="lsa_server" type="rpcserver"> +<module name="lsa_server" type="rpcserver" allowwarnings="true"> <file>lsa.idl</file> </module> <module name="lsa_client" type="rpcclient"> Added: trunk/reactos/include/reactos/idl/ms-dtyp.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/ms-dty… ============================================================================== --- trunk/reactos/include/reactos/idl/ms-dtyp.idl (added) +++ trunk/reactos/include/reactos/idl/ms-dtyp.idl [iso-8859-1] Sun May 18 10:17:12 2008 @@ -1,0 +1,283 @@ +cpp_quote("#ifndef _DTYP_IDL"); +cpp_quote("#define _DTYP_IDL"); + +/* Common data types */ + +typedef int BOOL, *PBOOL, *LPBOOL; +typedef unsigned char BYTE, *PBYTE, *LPBYTE; +typedef char CHAR, *PCHAR; +typedef unsigned long DWORD, *PDWORD, *LPDWORD; +typedef unsigned int DWORD32; +typedef unsigned __int64 DWORD64; +//typedef unsigned long error_status_t; +typedef int INT, *LPINT; +typedef signed char INT8; +typedef signed short INT16; +typedef signed int INT32; +typedef signed __int64 INT64; +typedef signed int LONG32; +typedef signed __int64 LONG64; +cpp_quote("#if 0"); +typedef long NTSTATUS; +cpp_quote("#endif"); +typedef unsigned __int64 QWORD; +typedef short SHORT; +typedef __int64 TIME; +typedef unsigned char UCHAR, *PUCHAR; +typedef unsigned int UINT; +typedef unsigned char UINT8; +typedef unsigned short UINT16; +typedef unsigned int UINT32; +typedef unsigned __int64 UINT64; +typedef unsigned long ULONG, *PULONG; +typedef unsigned int ULONG32; +typedef unsigned __int64 ULONG64; +typedef unsigned __int64 ULONGLONG; +typedef unsigned short USHORT; +typedef unsigned short WORD, *PWORD, *LPWORD; +typedef long LONG, *PLONG, *LPLONG; +typedef signed __int64 LONGLONG; + +typedef float FLOAT; +typedef double DOUBLE; + +typedef BYTE BOOLEAN, *PBOOLEAN; +#ifdef _WIN64 +typedef __int64 LONG_PTR; +typedef unsigned __int64 ULONG_PTR; +#else +typedef LONG LONG_PTR; +typedef ULONG ULONG_PTR; +#endif +typedef ULONG_PTR SIZE_T; +cpp_quote("#if 0"); +typedef UCHAR *STRING; +cpp_quote("#endif"); +typedef DWORD NET_API_STATUS; +typedef ULONG_PTR DWORD_PTR; +typedef ULONGLONG DWORDLONG, *PDWORDLONG; +typedef DWORD HCALL; +//typedef DWORD HRESULT; + +typedef void *HANDLE; +typedef void /*VOID,*/ *PVOID; +typedef void *RPC_BINDING_HANDLE; +typedef [context_handle] void *PCONTEXT_HANDLE, *PPCONTEXT_HANDLE; + +typedef wchar_t WCHAR, *PWCHAR; +cpp_quote("#if 0"); +typedef wchar_t UNICODE; +cpp_quote("#endif"); +typedef const char *LPCSTR; +typedef const wchar_t *LPCWSTR; +typedef char *PSTR, *LPSTR; +typedef wchar_t *LPWSTR, *PWSTR; +typedef const wchar_t *LMCSTR; +typedef WCHAR *LMSTR; +typedef WCHAR *BSTR; + +cpp_quote("#if 0"); +#ifdef Unicode +typedef LPCWSTR LPCTSTR; +typedef LPWSTR LPTSTR; +typedef WCHAR TCHAR; +#else +typedef LPCSTR LPCTSTR; +typedef LPSTR LPTSTR; +typedef CHAR TCHAR; +#endif +cpp_quote("#endif"); + +/* Common data structures */ + +cpp_quote("#if 0"); + +typedef struct _FILETIME { + DWORD dwLowDateTime; + DWORD dwHighDateTime; +} FILETIME, *PFILETIME, *LPFILETIME; + +typedef struct _GUID { + DWORD Data1; + WORD Data2; + WORD Data3; + BYTE Data4[8]; +} GUID, UUID, *PGUID; + +typedef struct _LARGE_INTEGER { + LONGLONG QuadPart; +} LARGE_INTEGER, *PLARGE_INTEGER; + +typedef DWORD LCID; + +cpp_quote("#endif"); + +typedef struct _RPC_UNICODE_STRING { + USHORT Length; + USHORT MaximumLength; + [size_is(MaximumLength/2), length_is(Length/2)] LPWSTR Buffer; +} RPC_UNICODE_STRING, *PRPC_UNICODE_STRING; + +cpp_quote("#if 0"); + +typedef struct _SYSTEMTIME { + WORD wYear; + WORD wMonth; + WORD wDayOfWeek; + WORD wDay; + WORD wHour; + WORD wMinute; + WORD wSecond; + WORD wMilliseconds; +} SYSTEMTIME, *PSYSTEMTIME; + +typedef struct _UINT128 { + UINT64 lower; + UINT64 upper; +} UINT128, *PUINT128; + +typedef struct _ULARGE_INTEGER { + ULONGLONG QuadPart; +} ULARGE_INTEGER, *PULARGE_INTEGER; + +typedef struct _UNICODE_STRING { + USHORT Length; + USHORT MaximumLength; + [size_is(MaximumLength/2), length_is(Length/2)] LPWSTR Buffer; +} UNICODE_STRING, *PUNICODE_STRING; + +cpp_quote("#endif"); + +/* Constructed security types */ + +cpp_quote("#if 0"); + +typedef struct _SID_IDENTIFIER_AUTHORITY { + BYTE Value[6]; +} SID_IDENTIFIER_AUTHORITY; + +typedef struct _SID { + BYTE Revision; + BYTE SubAuthorityCount; + SID_IDENTIFIER_AUTHORITY IdentifierAuthority; + [size_is(SubAuthorityCount)] DWORD SubAuthority[*]; +} SID, *PSID; + +typedef struct _ACCESS_MASK { + DWORD ACCESS_MASK; +} ACCESS_MASK, *PACCESS_MASK; + +typedef struct _ACE_HEADER { + UCHAR AceType; + UCHAR AceFlags; + USHORT AceSize; +} ACE_HEADER, *PACE_HEADER; + +typedef struct _ACCESS_ALLOWED_ACE { + ACE_HEADER Header; + ACCESS_MASK Mask; + DWORD SidStart; +} ACCESS_ALLOWED_ACE, *PACCESS_ALLOWED_ACE; + +typedef struct _ACCESS_ALLOWED_OBJECT_ACE { + ACE_HEADER Header; + ACCESS_MASK Mask; + DWORD Flags; + GUID ObjectType; + GUID InheritedObjectType; + DWORD SidStart; +} ACCESS_ALLOWED_OBJECT_ACE, *PACCESS_ALLOWED_OBJECT_ACE; + +typedef struct _ACCESS_DENIED_ACE { + ACE_HEADER Header; + ACCESS_MASK Mask; + DWORD SidStart; +} ACCESS_DENIED_ACE, *PACCESS_DENIED_ACE; + +typedef struct _ACCESS_ALLOWED_CALLBACK_ACE { + ACE_HEADER Header; + ACCESS_MASK Mask; + DWORD SidStart; +} ACCESS_ALLOWED_CALLBACK_ACE, *PACCESS_ALLOWED_CALLBACK_ACE; + +typedef struct _ACCESS_DENIED_CALLBACK_ACE { + ACE_HEADER Header; + ACCESS_MASK Mask; + DWORD SidStart; +} ACCESS_DENIED_CALLBACK_ACE, *PACCESS_DENIED_CALLBACK_ACE; + +typedef struct _ACCESS_ALLOWED_CALLBACK_OBJECT_ACE { + ACE_HEADER Header; + ACCESS_MASK Mask; + DWORD Flags; + GUID ObjectType; + GUID InheritedObjectType; + DWORD SidStart; +} ACCESS_ALLOWED_CALLBACK_OBJECT_ACE, *PACCESS_ALLOWED_CALLBACK_OBJECT_ACE; + +typedef struct _ACCESS_DENIED_CALLBACK_OBJECT_ACE { + ACE_HEADER Header; + ACCESS_MASK Mask; + DWORD Flags; + GUID ObjectType; + GUID InheritedObjectType; + DWORD SidStart; +} ACCESS_DENIED_CALLBACK_OBJECT_ACE, *PACCESS_DENIED_CALLBACK_OBJECT_ACE; + +typedef struct _SYSTEM_AUDIT_ACE { + ACE_HEADER Header; + ACCESS_MASK Mask; + DWORD SidStart; +} SYSTEM_AUDIT_ACE, *PSYSTEM_AUDIT_ACE; + +typedef struct _SYSTEM_AUDIT_CALLBACK_ACE { + ACE_HEADER Header; + ACCESS_MASK Mask; + DWORD SidStart; +} SYSTEM_AUDIT_CALLBACK_ACE, *PSYSTEM_AUDIT_CALLBACK_ACE; + +typedef struct _SYSTEM_MANDATORY_LABEL_ACE { + ACE_HEADER Header; + ACCESS_MASK Mask; + DWORD SidStart; +} SYSTEM_MANDATORY_LABEL_ACE, *PSYSTEM_MANDATORY_LABEL_ACE; + +typedef struct _SYSTEM_AUDIT_CALLBACK_OBJECT_ACE { + ACE_HEADER Header; + ACCESS_MASK Mask; + DWORD Flags; + GUID ObjectType; + GUID InheritedObjectType; + DWORD SidStart; +} SYSTEM_AUDIT_CALLBACK_OBJECT_ACE, *PSYSTEM_AUDIT_CALLBACK_OBJECT_ACE; + +typedef struct _ACL { + UCHAR AclRevision; + UCHAR Sbz1; + USHORT AclSize; + USHORT AceCount; + USHORT Sbz2; +} ACL, *PACL; + +typedef struct _SECURITY_DESCRIPTOR { + UCHAR Revision; + UCHAR Sbz1; + USHORT Control; + ULONG Owner; + ULONG Group; + ULONG Sacl; + ULONG Dacl; +} SECURITY_DESCRIPTOR, *PSECURITY_DESCRIPTOR; + +typedef DWORD SECURITY_INFORMATION, *PSECURITY_INFORMATION; + +cpp_quote("#endif"); + +typedef struct _RPC_SID { + UCHAR Revision; + UCHAR SubAuthorityCount; + SID_IDENTIFIER_AUTHORITY IdentifierAuthority; + [size_is(SubAuthorityCount)] DWORD SubAuthority[]; +} RPC_SID, *PRPC_SID; + +cpp_quote("#endif /* _DTYP_IDL */"); Propchange: trunk/reactos/include/reactos/idl/ms-dtyp.idl ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/include/reactos/idl/pnp.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/pnp.id… ============================================================================== --- trunk/reactos/include/reactos/idl/pnp.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/pnp.idl [iso-8859-1] Sun May 18 10:17:12 2008 @@ -2,7 +2,7 @@ * Plug and Play Manager RPC interface definition */ -#include "include/reactos/idl/wtypes.idl" +#include <ms-dtyp.idl> const unsigned long PNP_MAX_STRING_LEN = 32767; const unsigned long PNP_MAX_DEVICE_ID_LEN = 200; Modified: trunk/reactos/include/reactos/idl/svcctl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/svcctl… ============================================================================== --- trunk/reactos/include/reactos/idl/svcctl.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/svcctl.idl [iso-8859-1] Sun May 18 10:17:12 2008 @@ -2,7 +2,7 @@ * Service Control Manager (SCM) interface definition */ -#include "include/reactos/idl/wtypes.idl" +#include <ms-dtyp.idl> const unsigned int MAX_SERVICE_NAME_LENGTH = 255; const unsigned short SC_MAX_DEPEND_SIZE = 4 * 1024;

1 0

[dchapyshev] 33581: - Add "ReactOS Standard" and "ReactOS Classic" color schemes - Add registry keys for cursors schemes
by dchapyshev＠svn.reactos.org 18 May '08

18 May '08

Author: dchapyshev Date: Sun May 18 10:14:04 2008 New Revision: 33581 URL: http://svn.reactos.org/svn/reactos?rev=33581&view=rev Log: - Add "ReactOS Standard" and "ReactOS Classic" color schemes - Add registry keys for cursors schemes Modified: trunk/reactos/boot/bootdata/hivedef.inf trunk/reactos/boot/bootdata/hivesft.inf Modified: trunk/reactos/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivedef.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivedef.inf [iso-8859-1] Sun May 18 10:14:04 2008 @@ -23,6 +23,139 @@ HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,"" HKCU,"Control Panel\International",,0x00000012 HKCU,"Control Panel\International","Locale",0x00000000,"0409" + +;Cursors Schemes +HKCU,"Control Panel\Cursors",,,"ReactOS Default" +HKCU,"Control Panel\Cursors","Scheme Source",0x00010001,0x00000002 + +; Color schemes +HKCU,"Control Panel\Current","Color Schemes",0x00020000,"ReactOS Standard" +HKCU,"Control Panel\Appearance","Current",0x00020000,"ReactOS Standard" +HKCU,"Control Panel\Appearance","NewCurrent",0x00020000,"ReactOS Standard" +HKCU,"Control Panel\Appearance\New Schemes","SelectedStyle",0x00020000,"0" +; ReactOS Standard +HKCU,"Control Panel\Appearance\New Schemes\0","DisplayName",0x00020000,"@themeui.dll,-883" +HKCU,"Control Panel\Appearance\New Schemes\0","SelectedSize",0x00020000,"0" +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Flat Menus",0x00010001,0x00000000 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ +00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Font #1",0x00000001,f5,ff,ff,ff,00,00,00,\ +00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Font #2",0x00000001,f5,ff,ff,ff,00,00,00,\ +00,00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Font #4",0x00000001,f5,ff,ff,ff,00,00,00,\ +00,00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Font #5",0x00000001,f5,ff,ff,ff,00,00,00,\ +00,00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Font #3",0x00000001,f5,ff,ff,ff,00,00,00,\ +00,00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #0",0x00010001,0x00c8d0d4 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #1",0x00010001,0x00a56e3a +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #2",0x00010001,0x006a240a +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #3",0x00010001,0x00808080 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #4",0x00010001,0x00c8d0d4 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #5",0x00010001,0x00ffffff +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #6",0x00010001,0x00000000 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #7",0x00010001,0x00000000 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #8",0x00010001,0x00000000 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #9",0x00010001,0x00ffffff +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #10",0x00010001,0x00c8d0d4 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #11",0x00010001,0x00c8d0d4 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #12",0x00010001,0x00808080 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #13",0x00010001,0x006a240a +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #14",0x00010001,0x00ffffff +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #15",0x00010001,0x00c8d0d4 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #16",0x00010001,0x00808080 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #17",0x00010001,0x00808080 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #18",0x00010001,0x00000000 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #19",0x00010001,0x00c8d0d4 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #20",0x00010001,0x00ffffff +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #21",0x00010001,0x00404040 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #22",0x00010001,0x00c8d0d4 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #23",0x00010001,0x00000000 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #24",0x00010001,0x00e1ffff +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #25",0x00010001,0x00b5b5b5 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #26",0x00010001,0x00800000 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #27",0x00010001,0x00f0caa6 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #28",0x00010001,0x00c0c0c0 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #29",0x00010001,0x006a240a +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #30",0x00010001,0x00c8d0d4 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Contrast",0x00010001,0x00000000 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","LegacyName",0x00020000,"ReactOS Standard" +; ReactOS Classic +HKCU,"Control Panel\Appearance\New Schemes\1","DisplayName",0x00020000,"@themeui.dll,-880" +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Flat Menus",0x00010001,0x00000000 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ +00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,4d,00,69,00,63,00,72,00,6f,00,73,\ +00,6f,00,66,00,74,00,20,00,53,00,61,00,6e,00,73,00,20,00,53,00,65,00,72,00,69,00,66,00,00,00,fc,\ +7f,22,14,fc,7f,b0,fe,12,00,00,00,00,00,00,00,00,00,98,23,eb,77 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Font #1",0x00000001,f5,ff,ff,ff,00,00,00,\ +00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,4d,00,69,00,63,00,72,00,6f,00,73,\ +00,6f,00,66,00,74,00,20,00,53,00,61,00,6e,00,73,00,20,00,53,00,65,00,72,00,69,00,66,00,00,00,f0,\ +77,00,20,14,00,00,00,00,10,80,05,14,00,f0,1f,14,00,00,00,14,00 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Font #2",0x00000001,f5,ff,ff,ff,00,00,00,\ +00,00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,00,00,00,00,00,4d,00,69,00,63,00,72,00,6f,00,73,\ +00,6f,00,66,00,74,00,20,00,53,00,61,00,6e,00,73,00,20,00,53,00,65,00,72,00,69,00,66,00,00,00,14,\ +00,88,fb,e8,77,02,02,00,00,ac,b9,f0,77,00,00,00,00,20,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Font #4",0x00000001,f5,ff,ff,ff,00,00,00,\ +00,00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,00,00,00,00,00,4d,00,69,00,63,00,72,00,6f,00,73,\ +00,6f,00,66,00,74,00,20,00,53,00,61,00,6e,00,73,00,20,00,53,00,65,00,72,00,69,00,66,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,7c,6b,e8,77,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Font #5",0x00000001,f5,ff,ff,ff,00,00,00,\ +00,00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,00,00,00,00,00,4d,00,69,00,63,00,72,00,6f,00,73,\ +00,6f,00,66,00,74,00,20,00,53,00,61,00,6e,00,73,00,20,00,53,00,65,00,72,00,69,00,66,00,00,00,00,\ +00,06,00,00,00,18,00,00,00,ff,ff,ff,ff,f0,4b,21,fc,00,c4,f0,77 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Font #3",0x00000001,f5,ff,ff,ff,00,00,00,\ +00,00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,00,00,00,00,00,4d,00,69,00,63,00,72,00,6f,00,73,\ +00,6f,00,66,00,74,00,20,00,53,00,61,00,6e,00,73,00,20,00,53,00,65,00,72,00,69,00,66,00,00,00,14,\ +00,0b,00,00,00,00,ff,12,00,50,00,00,00,c0,fe,12,00,0c,10,00,01 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #0",0x00010001,0x00c0c0c0 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #1",0x00010001,0x00a56e3a +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #2",0x00010001,0x00800000 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #3",0x00010001,0x00808080 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #4",0x00010001,0x00c0c0c0 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #5",0x00010001,0x00ffffff +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #6",0x00010001,0x00000000 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #7",0x00010001,0x00000000 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #8",0x00010001,0x00000000 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #9",0x00010001,0x00ffffff +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #10",0x00010001,0x00c0c0c0 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #11",0x00010001,0x00c0c0c0 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #12",0x00010001,0x00808080 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #13",0x00010001,0x00800000 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #14",0x00010001,0x00ffffff +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #15",0x00010001,0x00c0c0c0 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #16",0x00010001,0x00808080 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #17",0x00010001,0x00808080 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #18",0x00010001,0x00000000 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #19",0x00010001,0x00c0c0c0 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #20",0x00010001,0x00ffffff +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #21",0x00010001,0x00000000 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #22",0x00010001,0x00c0c0c0 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #23",0x00010001,0x00000000 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #24",0x00010001,0x00e1ffff +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #25",0x00010001,0x00c0c0c0 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #26",0x00010001,0x00800000 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #27",0x00010001,0x00d08410 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #28",0x00010001,0x00b5b5b5 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #29",0x00010001,0x00800000 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #30",0x00010001,0x00c0c0c0 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Contrast",0x00010001,0x00000000 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","LegacyName",0x00020000,"ReactOS Classic" HKCU,"Environment",,0x00000012 HKCU,"Environment","TEMP",0x00020000,"%USERPROFILE%\Local Settings\Temp" Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] Sun May 18 10:14:04 2008 @@ -795,6 +795,9 @@ HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\DateTime\Servers","7",0x00000000,"time.windows.com" HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\DateTime\Servers","8",0x00000000,"time.nist.gov" +;Cursors Schemes +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Control Panel\Cursors\Schemes","ReactOS Default",0x00020000,"\",,,,,,,,,,,,,\"" + ; deskadp.dll shell extension HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Controls Folder\Device\shellex\PropertySheetHandlers\Display Adapter CPL Extension","",0x00000000,"{42071712-76d4-11d1-8b24-00a0c9068ff3}"

1 0

[dchapyshev] 33580: - Update icons
by dchapyshev＠svn.reactos.org 18 May '08

18 May '08

Author: dchapyshev Date: Sun May 18 10:06:30 2008 New Revision: 33580 URL: http://svn.reactos.org/svn/reactos?rev=33580&view=rev Log: - Update icons Modified: trunk/reactos/dll/cpl/desk/resources/applet.ico trunk/reactos/dll/cpl/main/resources/folder_closed.ico Modified: trunk/reactos/dll/cpl/desk/resources/applet.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/resources/app… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/main/resources/folder_closed.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/resources/fol… ============================================================================== Binary files - no diff available.

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
59
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2008