Ros-diffs November 2005

ros-diffs@reactos.org

27 participants
875 discussions

[sedwards] 19492: Identifier '__value' changed everywhere to '__val' to avoid clashes with Microsoft's 'managed C++' keyword

by sedwards＠svn.reactos.com

Identifier '__value' changed everywhere to '__val' to avoid clashes with Microsoft's 'managed C++' keyword Modified: trunk/reactos/lib/crt/include/internal/mbstring.h Modified: trunk/reactos/lib/crt/math/atan2.c Modified: trunk/reactos/lib/crt/math/fmod.c Modified: trunk/reactos/lib/crt/math/ldexp.c Modified: trunk/reactos/lib/crt/math/log10.c Modified: trunk/reactos/lib/crt/math/pow.c _____ Modified: trunk/reactos/lib/crt/include/internal/mbstring.h --- trunk/reactos/lib/crt/include/internal/mbstring.h 2005-11-23 17:31:28 UTC (rev 19491) +++ trunk/reactos/lib/crt/include/internal/mbstring.h 2005-11-23 17:53:08 UTC (rev 19492) @@ -13,7 +13,9 @@ #define _M_ _KNJ_M /* Non-puntuation in Kana-set */ #define _P_ _KNJ_P /* Punctuation of Kana-set */ #define _12 (_1_|__2) +#ifndef _M2 #define _M2 (_M_|__2) +#endif #define _P2 (_P_|__2) _____ Modified: trunk/reactos/lib/crt/math/atan2.c --- trunk/reactos/lib/crt/math/atan2.c 2005-11-23 17:31:28 UTC (rev 19491) +++ trunk/reactos/lib/crt/math/atan2.c 2005-11-23 17:53:08 UTC (rev 19492) @@ -8,14 +8,14 @@ */ double atan2 (double __y, double __x) { - register double __value; + register double __val; #ifdef __GNUC__ __asm __volatile__ ("fpatan\n\t" "fld %%st(0)" - : "=t" (__value) : "0" (__x), "u" (__y)); + : "=t" (__val) : "0" (__x), "u" (__y)); #else - __value = linkme_atan2(__x, __y); + __val = linkme_atan2(__x, __y); #endif /*__GNUC__*/ - return __value; + return __val; } _____ Modified: trunk/reactos/lib/crt/math/fmod.c --- trunk/reactos/lib/crt/math/fmod.c 2005-11-23 17:31:28 UTC (rev 19491) +++ trunk/reactos/lib/crt/math/fmod.c 2005-11-23 17:53:08 UTC (rev 19492) @@ -24,16 +24,16 @@ double fmod (double __x, double __y) { - register double __value; + register double __val; #ifdef __GNUC__ __asm __volatile__ ("1: fprem\n\t" "fstsw %%ax\n\t" "sahf\n\t" "jp 1b" - : "=t" (__value) : "0" (__x), "u" (__y) : "ax", "cc"); + : "=t" (__val) : "0" (__x), "u" (__y) : "ax", "cc"); #else - __value = linkme_fmod(__x, __y); + __val = linkme_fmod(__x, __y); #endif /*__GNUC__*/ - return __value; + return __val; } _____ Modified: trunk/reactos/lib/crt/math/ldexp.c --- trunk/reactos/lib/crt/math/ldexp.c 2005-11-23 17:31:28 UTC (rev 19491) +++ trunk/reactos/lib/crt/math/ldexp.c 2005-11-23 17:53:08 UTC (rev 19492) @@ -24,13 +24,13 @@ double ldexp (double __x, int __y) { - register double __value; + register double __val; #ifdef __GNUC__ __asm __volatile__ ("fscale" - : "=t" (__value) : "0" (__x), "u" ((double) __y)); + : "=t" (__val) : "0" (__x), "u" ((double) __y)); #else - __value = linkme_ldexp(__x, __y); + __val = linkme_ldexp(__x, __y); #endif /*__GNUC__*/ - return __value; + return __val; } _____ Modified: trunk/reactos/lib/crt/math/log10.c --- trunk/reactos/lib/crt/math/log10.c 2005-11-23 17:31:28 UTC (rev 19491) +++ trunk/reactos/lib/crt/math/log10.c 2005-11-23 17:53:08 UTC (rev 19492) @@ -24,15 +24,15 @@ double log10 (double __x) { - register double __value; + register double __val; #ifdef __GNUC__ __asm __volatile__ ("fldlg2\n\t" "fxch\n\t" "fyl2x" - : "=t" (__value) : "0" (__x)); + : "=t" (__val) : "0" (__x)); #else - __value = linkme_log10(__x); + __val = linkme_log10(__x); #endif /*__GNUC__*/ - return __value; + return __val; } _____ Modified: trunk/reactos/lib/crt/math/pow.c --- trunk/reactos/lib/crt/math/pow.c 2005-11-23 17:31:28 UTC (rev 19491) +++ trunk/reactos/lib/crt/math/pow.c 2005-11-23 17:53:08 UTC (rev 19492) @@ -26,18 +26,18 @@ double __log2 (double __x) { - register double __value; + register double __val; #ifdef __GNUC__ __asm __volatile__ ("fld1\n\t" "fxch\n\t" "fyl2x" - : "=t" (__value) : "0" (__x)); + : "=t" (__val) : "0" (__x)); #else //__value = linkme_log2(__x); - __value = 0; + __val = 0; #endif /*__GNUC__*/ - return __value; + return __val; } /* @@ -45,7 +45,7 @@ */ double pow (double __x, double __y) { - register double __value; + register double __val; #ifdef __GNUC__ register double __exponent; long __p = (long) __y; @@ -80,15 +80,15 @@ "fxch\n\t" "fsub %%st(1) # fract(y * log2(x))\n\t" "f2xm1 # 2^(fract(y * log2(x))) - 1\n\t" - : "=t" (__value), "=u" (__exponent) : "0" (__log2 (__x)), "1" (__y)); - __value += 1.0; + : "=t" (__val), "=u" (__exponent) : "0" (__log2 (__x)), "1" (__y)); + __val += 1.0; __asm __volatile__ ("fscale" - : "=t" (__value) : "0" (__value), "u" (__exponent)); + : "=t" (__val) : "0" (__val), "u" (__exponent)); #else - __value = linkme_pow(__x, __y); + __val = linkme_pow(__x, __y); #endif /*__GNUC__*/ - return __value; + return __val; } long double powl (long double __x,long double __y)

18 years, 10 months

[chorns] 19491: ReactOS Sin Custom Revision Action (Revision ISO Creator)

by chorns＠svn.reactos.com

ReactOS Sin Custom Revision Action (Revision ISO Creator) Added: trunk/cis/ReactOS.CustomRevisionAction/ Added: trunk/cis/ReactOS.CustomRevisionAction/App.config Added: trunk/cis/ReactOS.CustomRevisionAction/AssemblyInfo.cs Added: trunk/cis/ReactOS.CustomRevisionAction/Default.build Added: trunk/cis/ReactOS.CustomRevisionAction/Main.cs Added: trunk/cis/ReactOS.CustomRevisionAction/RedirectableProcess.cs _____ Added: trunk/cis/ReactOS.CustomRevisionAction/App.config --- trunk/cis/ReactOS.CustomRevisionAction/App.config 2005-11-23 17:25:55 UTC (rev 19490) +++ trunk/cis/ReactOS.CustomRevisionAction/App.config 2005-11-23 17:31:28 UTC (rev 19491) @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8" ?> +<configuration> + <appSettings> + <add key="publishPath" value="c:\iso" /> + <add key="smtpServer" value="localhost" /> + <add key="errorEmail" value="mailbox@somewhere-on-the-net" /> + <add key="makeParameters" value="" /> + <add key="fastDisk" value="" /> + </appSettings> +</configuration> _____ Added: trunk/cis/ReactOS.CustomRevisionAction/AssemblyInfo.cs --- trunk/cis/ReactOS.CustomRevisionAction/AssemblyInfo.cs 2005-11-23 17:25:55 UTC (rev 19490) +++ trunk/cis/ReactOS.CustomRevisionAction/AssemblyInfo.cs 2005-11-23 17:31:28 UTC (rev 19491) @@ -0,0 +1,14 @@ +using System.Reflection; +using System.Runtime.CompilerServices; + +[assembly: AssemblyTitle("ReactOS Sin Custom Revision Action")] +[assembly: AssemblyDescription("ReactOS Sin Custom Revision Action")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("ReactOS Project")] +[assembly: AssemblyProduct("React Operating System")] +[assembly: AssemblyCopyright("Copyright 2005 ReactOS Project")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] +[assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyDelaySign(false)] +[assembly: AssemblyKeyFile("")] _____ Added: trunk/cis/ReactOS.CustomRevisionAction/Default.build --- trunk/cis/ReactOS.CustomRevisionAction/Default.build 2005-11-23 17:25:55 UTC (rev 19490) +++ trunk/cis/ReactOS.CustomRevisionAction/Default.build 2005-11-23 17:31:28 UTC (rev 19491) @@ -0,0 +1,20 @@ +<?xml version="1.0"?> +<project name="ReactOS.CustomRevisionAction" default="build"> + + <property name="output.dir" value="bin" /> + + <target name="build" description="Build component"> + <mkdir dir="${output.dir}" /> + <csc target="exe" + output="${output.dir}\ReactOS.CustomRevisionAction.exe" + optimize="true" + debug="true" + doc="${output.dir}\ReactOS.CustomRevisionAction.xml" + warninglevel="0"> + <sources> + <include name="*.cs" /> + </sources> + </csc> + </target> + +</project> _____ Added: trunk/cis/ReactOS.CustomRevisionAction/Main.cs --- trunk/cis/ReactOS.CustomRevisionAction/Main.cs 2005-11-23 17:25:55 UTC (rev 19490) +++ trunk/cis/ReactOS.CustomRevisionAction/Main.cs 2005-11-23 17:31:28 UTC (rev 19491) @@ -0,0 +1,254 @@ +using System; +using System.IO; +using System.Diagnostics; +using System.Configuration; +using System.Web.Mail; + +namespace ReactOS.CustomRevisionAction +{ + public class MainClass + { + /// <summary> + /// Path to store published binaries at. + /// </summary> + private static string publishPath; + + /// <summary> + /// Run the application. + /// </summary> + /// <param name="script">Script to run.</param> + /// <param name="args">Arguments to pass to script.</param> + /// <param name="workingDirectory">Working directory.</param> + /// <param name="standardOutput">Receives standard output.</param> + /// <param name="standardError">Receives standard error.</param> + /// <returns> + /// Exit code. + /// </returns> + private static int RunScript(string script, + string args, + string workingDirectory, + out string standardOutput, + out string standardError) + { + ProcessStartInfo scriptProcessStartInfo = new ProcessStartInfo(script, + args); + scriptProcessStartInfo.CreateNoWindow = true; + /* + * All standard streams must be redirected. + * Otherwise DuplicateHandle() will fail. + */ + scriptProcessStartInfo.RedirectStandardInput = true; + scriptProcessStartInfo.RedirectStandardError = true; + scriptProcessStartInfo.RedirectStandardOutput = true; + scriptProcessStartInfo.UseShellExecute = false; + scriptProcessStartInfo.WorkingDirectory = workingDirectory; + RedirectableProcess redirectableProcess = new RedirectableProcess(scriptProcessStartInfo); + standardOutput = redirectableProcess.ProcessOutput; + standardError = redirectableProcess.ProcessError; + return redirectableProcess.ExitCode; + } + + /// <summary> + /// Retrieve value of configuration from configuration file. + /// </summary> + /// <param name="name">Name of configuration option.</param> + /// <param name="defaultValue"> + /// Default value to be returned if the option does not exist. + /// </param> + /// <returns> + /// Value of configuration option or null if the option does not + /// exist and no default value is provided. + /// </returns> + private static string GetConfigurationOption(string name, + string defaultValue) + { + if (ConfigurationSettings.AppSettings[name] != null) + return ConfigurationSettings.AppSettings[name]; + else + return defaultValue; + } + + /// <summary> + /// Send an email. + /// </summary> + /// <param name="subject">Subject of the email.</param> + /// <param name="body">Content of the email.</param> + private static void SendErrorMail(string subject, string body) + { + try + { + string smtpServer = GetConfigurationOption("smtpServer", "localhost"); + string toEmail = GetConfigurationOption("errorEmail", null); + if (toEmail == null) + return; + string fromEmail = GetConfigurationOption("fromEmail", null); + if (fromEmail == null) + fromEmail = toEmail; + MailMessage mm = new MailMessage(); + mm.Priority = MailPriority.Normal; + mm.From = toEmail; + mm.To = toEmail; + mm.Subject = subject; + mm.Body += body; + mm.Body += "<br>"; + mm.BodyFormat = MailFormat.Html; + SmtpMail.SmtpServer = smtpServer; + SmtpMail.Send(mm); + } + catch (Exception ex) + { + Console.Error.WriteLine(ex.Message); + } + } + + /// <summary> + /// Fail with an error message. + /// </summary> + /// <param name="revision">Repository revision.</param> + /// <param name="text">Error message.</param> + private static void Fail(int revision, + string text) + { + Console.WriteLine(text); + Console.Error.WriteLine(text); + SendErrorMail(String.Format("[{0}] ReactOS Publish Error", revision), text); + } + + /// <summary> + /// Fail with an error message. + /// </summary> + /// <param name="text">Error message.</param> + private static void Fail(string text) + { + Console.WriteLine(text); + Console.Error.WriteLine(text); + SendErrorMail("ReactOS Publish Error", text); + } + + /// <summary> + /// Generate filename of distribution. + /// </summary> + /// <param name="branch">Branch.</param> + /// <param name="revision">Revision.</param> + private static string GetDistributionFilename(string branch, + int revision) + { + return String.Format("ReactOS-{0}-r{1}.iso", + branch, + revision); + } + + /// <summary> + /// Copy ISO to the destination. + /// </summary> + /// <param name="sourceFilename">Name of source ISO file to copy.</param> + /// <param name="branch">Branch.</param> + /// <param name="revision">Revision.</param> + /// <remarks> + /// Structure is <branch>\ReactOS-<branch>-r<revision>.iso. + /// </remarks> + private static void CopyISOToDestination(string sourceFilename, + string branch, + int revision) + { + string distributionFilename = GetDistributionFilename(branch, + revision); + string destinationDirectory = Path.Combine(publishPath, + branch); + string destinationFilename = Path.Combine(destinationDirectory, + distributionFilename); + if (!Directory.Exists(destinationDirectory)) + Directory.CreateDirectory(destinationDirectory); + File.Copy(sourceFilename, + destinationFilename); + } + + /// <summary> + /// Publish a revision of ReactOS. + /// </summary> + /// <param name="text">Error message.</param> + private static int Publish(string branch, + int revision, + string workingDirectory) + { + string make = "mingw32-make"; + string makeParameters = GetConfigurationOption("makeParameters", ""); + string reactosDirectory = Path.Combine(workingDirectory, + "reactos"); + Console.WriteLine(String.Format("ReactOS directory is {0}", + reactosDirectory)); + string standardOutput; + string standardError; + int exitCode = RunScript(make, + makeParameters + " bootcd", + reactosDirectory, + out standardOutput, + out standardError); + if (exitCode != 0) + { + Fail(revision, + String.Format("make bootcd failed: (error: {0}) {1}", + standardError, + standardOutput)); + return exitCode; + } + + string sourceFilename = Path.Combine(reactosDirectory, + "ReactOS.iso"); + if (File.Exists(sourceFilename)) + CopyISOToDestination(sourceFilename, + branch, + revision); + else + { + Fail(revision, + "make bootcd produced no ReactOS.iso"); + return exitCode; + } + + return exitCode; + } + + /// <summary> + /// Program entry point. + /// </summary> + /// <param name="args">Arguments from command line.</param> + /// <remarks> + /// If exit code is 0, then the commit was processed successfully. + /// If exit code is 1, then the commit was not processed successfully. + /// </remarks> + public static void Main(string[] args) + { + try + { + System.Environment.ExitCode = 1; + + publishPath = ConfigurationSettings.AppSettings["publishPath"]; + if (publishPath == null) + { + Fail("PublishPath option not set."); + return; + } + + if (args.Length < 3) + { + Fail("Usage: ReactOS.CustomRevisionAction action branch revision"); + return; + } + + string action = args[0]; /* bootcd */ + string branch = args[1]; + int revision = Int32.Parse(args[2]); + + System.Environment.ExitCode = Publish(branch, + revision, + System.Environment.CurrentDirectory); + } + catch (Exception ex) + { + Fail(String.Format("Exception: {0}", ex)); + System.Environment.ExitCode = 1; + } + } + } +} _____ Added: trunk/cis/ReactOS.CustomRevisionAction/RedirectableProcess.cs --- trunk/cis/ReactOS.CustomRevisionAction/RedirectableProcess.cs 2005-11-23 17:25:55 UTC (rev 19490) +++ trunk/cis/ReactOS.CustomRevisionAction/RedirectableProcess.cs 2005-11-23 17:31:28 UTC (rev 19491) @@ -0,0 +1,145 @@ +/* + * When using the ProcessStartInfo.RedirectStandardXxx properties there is a chance of + * the parent and child process blocking due to a race condition. This class handles the + * problem. + * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/h tml/frlrfsystemdiagnosticsprocessstartinfoclassredirectstandardoutputtop ic.asp + */ +using System; +using System.IO; +using System.Threading; +using System.Diagnostics; + +namespace ReactOS.CustomRevisionAction +{ + /// <summary> + /// Process that redirects standard output and standard error streams. + /// </summary> + public class RedirectableProcess + { + /// <summary> + /// Process. + /// </summary> + private Process process; + + /// <summary> + /// Redirected standard error stream. + /// </summary> + private string processError; + + /// <summary> + /// Redirected standard output stream. + /// </summary> + private string processOutput; + + /// <summary> + /// Exit code. + /// </summary> + private int exitCode; + + /// <summary> + /// Redirected standard error stream. + /// </summary> + public string ProcessError + { + get + { + return processError; + } + } + + /// <summary> + /// Redirected standard output stream. + /// </summary> + public string ProcessOutput + { + get + { + return processOutput; + } + } + + /// <summary> + /// Exit code. + /// </summary> + public int ExitCode + { + get + { + return exitCode; + } + } + + /// <summary> + /// Run an excutable and redirect standard error and/or standard output safely. + /// </summary> + public RedirectableProcess(ProcessStartInfo processStartInfo) + { + Run(processStartInfo, null); + } + + /// <summary> + /// Run an excutable and redirect standard error and/or standard output safely. + /// </summary> + public RedirectableProcess(ProcessStartInfo processStartInfo, string input) + { + Run(processStartInfo, input); + } + + private void Run(ProcessStartInfo processStartInfo, string input) + { + process = new Process(); + process.StartInfo = processStartInfo; + process.Start(); + if (processStartInfo.RedirectStandardInput && input != null) + { + process.StandardInput.AutoFlush = true; + process.StandardInput.WriteLine(input); + } + Thread readStandardError = null; + if (processStartInfo.RedirectStandardError) + { + readStandardError = new Thread(new ThreadStart(ReadStandardError)); + readStandardError.Start(); + } + Thread readStandardOutput = null; + if (processStartInfo.RedirectStandardOutput) + { + readStandardOutput = new Thread(new ThreadStart(ReadStandardOutput)); + readStandardOutput.Start(); + } + if (processStartInfo.RedirectStandardError) + { + readStandardError.Join(); + } + if (processStartInfo.RedirectStandardOutput) + { + readStandardOutput.Join(); + } + process.WaitForExit(); + exitCode = process.ExitCode; + process = null; + } + + /// <summary> + /// Read standard error thread entry-point. + /// </summary> + private void ReadStandardError() + { + if (process != null) + { + processError = process.StandardError.ReadToEnd(); + } + } + + /// <summary> + /// Read standard output thread entry-point. + /// </summary> + private void ReadStandardOutput() + { + if (process != null) + { + processOutput = process.StandardOutput.ReadToEnd(); + } + } + } +}

18 years, 10 months

[chorns] 19490: ReactOS Sin Verifier

by chorns＠svn.reactos.com

ReactOS Sin Verifier Added: trunk/cis/ReactOS.Verify/ Added: trunk/cis/ReactOS.Verify/App.config Added: trunk/cis/ReactOS.Verify/AssemblyInfo.cs Added: trunk/cis/ReactOS.Verify/Default.build Added: trunk/cis/ReactOS.Verify/Main.cs Added: trunk/cis/ReactOS.Verify/RedirectableProcess.cs _____ Added: trunk/cis/ReactOS.Verify/App.config --- trunk/cis/ReactOS.Verify/App.config 2005-11-23 16:57:00 UTC (rev 19489) +++ trunk/cis/ReactOS.Verify/App.config 2005-11-23 17:25:55 UTC (rev 19490) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8" ?> +<configuration> + <appSettings> + <add key="smtpServer" value="localhost" /> + <add key="errorEmail" value="mailbox@somewhere-on-the-net" /> + <add key="makeParameters" value="" /> + <add key="fastDisk" value="" /> + </appSettings> +</configuration> _____ Added: trunk/cis/ReactOS.Verify/AssemblyInfo.cs --- trunk/cis/ReactOS.Verify/AssemblyInfo.cs 2005-11-23 16:57:00 UTC (rev 19489) +++ trunk/cis/ReactOS.Verify/AssemblyInfo.cs 2005-11-23 17:25:55 UTC (rev 19490) @@ -0,0 +1,14 @@ +using System.Reflection; +using System.Runtime.CompilerServices; + +[assembly: AssemblyTitle("ReactOS Sin Verifier")] +[assembly: AssemblyDescription("ReactOS Sin Verifier")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("ReactOS Project")] +[assembly: AssemblyProduct("React Operating System")] +[assembly: AssemblyCopyright("Copyright 2005 ReactOS Project")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] +[assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyDelaySign(false)] +[assembly: AssemblyKeyFile("")] _____ Added: trunk/cis/ReactOS.Verify/Default.build --- trunk/cis/ReactOS.Verify/Default.build 2005-11-23 16:57:00 UTC (rev 19489) +++ trunk/cis/ReactOS.Verify/Default.build 2005-11-23 17:25:55 UTC (rev 19490) @@ -0,0 +1,20 @@ +<?xml version="1.0"?> +<project name="ReactOS.Verify" default="build"> + + <property name="output.dir" value="bin" /> + + <target name="build" description="Build component"> + <mkdir dir="${output.dir}" /> + <csc target="exe" + output="${output.dir}\ReactOS.Verify.exe" + optimize="true" + debug="true" + doc="${output.dir}\ReactOS.Verify.xml" + warninglevel="0"> + <sources> + <include name="*.cs" /> + </sources> + </csc> + </target> + +</project> _____ Added: trunk/cis/ReactOS.Verify/Main.cs --- trunk/cis/ReactOS.Verify/Main.cs 2005-11-23 16:57:00 UTC (rev 19489) +++ trunk/cis/ReactOS.Verify/Main.cs 2005-11-23 17:25:55 UTC (rev 19490) @@ -0,0 +1,279 @@ +using System; +using System.IO; +using System.Diagnostics; +using System.Configuration; +using System.Web.Mail; +using System.Collections; +using System.Collections.Specialized; + +namespace ReactOS.Verify +{ + public class MainClass + { + /// <summary> + /// Run the application. + /// </summary> + /// <param name="script">Script to run.</param> + /// <param name="args">Arguments to pass to script.</param> + /// <param name="workingDirectory">Working directory.</param> + /// <param name="standardOutput">Receives standard output.</param> + /// <param name="standardError">Receives standard error.</param> + /// <returns> + /// Exit code. + /// </returns> + private static int RunScript(string script, + string args, + string workingDirectory, + StringDictionary environmentVarables, + out string standardOutput, + out string standardError) + { + ProcessStartInfo scriptProcessStartInfo = new ProcessStartInfo(script, + args); + scriptProcessStartInfo.CreateNoWindow = true; + /* + * All standard streams must be redirected. + * Otherwise DuplicateHandle() will fail. + */ + scriptProcessStartInfo.RedirectStandardInput = true; + scriptProcessStartInfo.RedirectStandardError = true; + scriptProcessStartInfo.RedirectStandardOutput = true; + scriptProcessStartInfo.UseShellExecute = false; + scriptProcessStartInfo.WorkingDirectory = workingDirectory; + if (environmentVarables != null) + { + foreach (DictionaryEntry de in environmentVarables) + scriptProcessStartInfo.EnvironmentVariables.Add(de.Key as string, de.Value as string); + } + RedirectableProcess redirectableProcess = new RedirectableProcess(scriptProcessStartInfo); + standardOutput = redirectableProcess.ProcessOutput; + standardError = redirectableProcess.ProcessError; + return redirectableProcess.ExitCode; + } + + /// <summary> + /// Retrieve value of configuration from configuration file. + /// </summary> + /// <param name="name">Name of configuration option.</param> + /// <param name="defaultValue"> + /// Default value to be returned if the option does not exist. + /// </param> + /// <returns> + /// Value of configuration option or null if the option does not + /// exist and no default value is provided. + /// </returns> + private static string GetConfigurationOption(string name, + string defaultValue) + { + if (ConfigurationSettings.AppSettings[name] != null) + { + string s = ConfigurationSettings.AppSettings[name].Trim(); + return s.Equals(String.Empty) ? defaultValue : s; + } + else + return defaultValue; + } + + /// <summary> + /// Send an email. + /// </summary> + /// <param name="subject">Subject of the email.</param> + /// <param name="body">Content of the email.</param> + private static void SendErrorMail(string subject, string body) + { + try + { + string smtpServer = GetConfigurationOption("smtpServer", "localhost"); + string email = GetConfigurationOption("errorEmail", null); + if (email == null) + return; + MailMessage mm = new MailMessage(); + mm.Priority = MailPriority.Normal; + mm.From = email; + mm.To = email; + mm.Subject = subject; + mm.Body += body; + mm.Body += "<br>"; + mm.BodyFormat = MailFormat.Html; + SmtpMail.SmtpServer = smtpServer; + SmtpMail.Send(mm); + } + catch (Exception ex) + { + Console.Error.WriteLine(ex.Message); + } + } + + /// <summary> + /// Fail with an error message. + /// </summary> + /// <param name="text">Error message.</param> + private static void Fail(string text) + { + Console.WriteLine(text); + } + + /// <summary> + /// Paths to fast disk for temporary files. + /// </summary> + private static string TemporaryFastDisk + { + get + { + string temporaryFastDisk = GetConfigurationOption("temporaryFastDisk", null); + if (temporaryFastDisk == null || temporaryFastDisk.Trim().Equals(String.Empty)) + return null; + return temporaryFastDisk.Trim(); + } + } + + /// <summary> + /// Paths to fast disk for intermediate files. + /// </summary> + private static string IntermediateFastDisk + { + get + { + string intermediateFastDisk = GetConfigurationOption("intermediateFastDisk", null); + if (intermediateFastDisk == null || intermediateFastDisk.Trim().Equals(String.Empty)) + return null; + return intermediateFastDisk.Trim(); + } + } + + /// <summary> + /// Paths to fast disk for output files. + /// </summary> + private static string OutputFastDisk + { + get + { + string outputFastDisk = GetConfigurationOption("outputFastDisk", null); + if (outputFastDisk == null || outputFastDisk.Trim().Equals(String.Empty)) + return null; + return outputFastDisk.Trim(); + } + } + + /// <summary> + /// Return collection of environment variables. + /// </summary> + /// <returns>Collection of environment variables or null if there is none.</returns> + private static StringDictionary GetEnvironmentVarables() + { + StringDictionary environmentVarables = new StringDictionary(); + if (TemporaryFastDisk != null) + environmentVarables.Add("ROS_TEMPORARY", TemporaryFastDisk); + if (IntermediateFastDisk != null) + environmentVarables.Add("ROS_INTERMEDIATE", IntermediateFastDisk); + if (OutputFastDisk != null) + environmentVarables.Add("ROS_OUTPUT", OutputFastDisk); + return environmentVarables; + } + + /// <summary> + /// Run make. + /// </summary> + /// <param name="arguments">Arguments.</param> + /// <param name="standardOutput">Receives standard output.</param> + /// <param name="standardError">Receives standard error.</param> + /// <returns>Make exit code.</returns> + private static int RunMake(string arguments, + out string standardOutput, + out string standardError) + { + string make = "mingw32-make"; + string makeParameters = GetConfigurationOption("makeParameters", ""); + string reactosDirectory = Path.Combine(System.Environment.CurrentDirectory, + "reactos"); + return RunScript(make, + makeParameters + " " + arguments, + reactosDirectory, + GetEnvironmentVarables(), + out standardOutput, + out standardError); + } + + /// <summary> + /// Verify a revision of ReactOS by building it all. + /// </summary> + private static int VerifyFull() + { + string standardOutput; + string standardError; + int exitCode = RunMake("bootcd", + out standardOutput, + out standardError); + if (exitCode != 0) + { + Fail(String.Format("make bootcd failed: (error: {0}) {1}", + standardError, + standardOutput)); + return exitCode; + } + + string reactosDirectory = Path.Combine(System.Environment.CurrentDirectory, + "reactos"); + string isoFilename = Path.Combine(reactosDirectory, + "ReactOS.iso"); + if (!File.Exists(isoFilename)) + Fail("make bootcd produced no ReactOS.iso"); + + return exitCode; + } + + /// <summary> + /// Verify a revision of ReactOS by building parts. + /// </summary> + /// <param name="components">Comma separated list of components to build.</param> + private static int VerifyPartial(string components) + { + string standardOutput; + string standardError; + string componentParameters = "\"" + components.Replace(",", "\" \"") + "\""; + int exitCode = RunMake(componentParameters, + out standardOutput, + out standardError); + if (exitCode != 0) + Fail(String.Format("make failed for targets {0}: (error: {1}) {2}", + componentParameters, + standardError, + standardOutput)); + return exitCode; + } + + /// <summary> + /// Verify a revision of ReactOS. + /// </summary> + /// <param name="args">Arguments from command line.</param> + private static int Verify(string[] args) + { + if (args.Length > 0) + return VerifyPartial(args[0]); + else + return VerifyFull(); + } + + /// <summary> + /// Program entry point. + /// </summary> + /// <param name="args">Arguments from command line.</param> + /// <remarks> + /// If exit code is 0, then the commit was processed successfully. + /// If exit code is 1, then the commit was not processed successfully. + /// </remarks> + public static void Main(string[] args) + { + try + { + System.Environment.ExitCode = Verify(args); + } + catch (Exception ex) + { + string text = String.Format("Exception: {0}", ex); + SendErrorMail("ReactOS Verify Error", text); + System.Environment.ExitCode = 1; + } + } + } +} _____ Added: trunk/cis/ReactOS.Verify/RedirectableProcess.cs --- trunk/cis/ReactOS.Verify/RedirectableProcess.cs 2005-11-23 16:57:00 UTC (rev 19489) +++ trunk/cis/ReactOS.Verify/RedirectableProcess.cs 2005-11-23 17:25:55 UTC (rev 19490) @@ -0,0 +1,145 @@ +/* + * When using the ProcessStartInfo.RedirectStandardXxx properties there is a chance of + * the parent and child process blocking due to a race condition. This class handles the + * problem. + * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/h tml/frlrfsystemdiagnosticsprocessstartinfoclassredirectstandardoutputtop ic.asp + */ +using System; +using System.IO; +using System.Threading; +using System.Diagnostics; + +namespace ReactOS.Verify +{ + /// <summary> + /// Process that redirects standard output and standard error streams. + /// </summary> + public class RedirectableProcess + { + /// <summary> + /// Process. + /// </summary> + private Process process; + + /// <summary> + /// Redirected standard error stream. + /// </summary> + private string processError; + + /// <summary> + /// Redirected standard output stream. + /// </summary> + private string processOutput; + + /// <summary> + /// Exit code. + /// </summary> + private int exitCode; + + /// <summary> + /// Redirected standard error stream. + /// </summary> + public string ProcessError + { + get + { + return processError; + } + } + + /// <summary> + /// Redirected standard output stream. + /// </summary> + public string ProcessOutput + { + get + { + return processOutput; + } + } + + /// <summary> + /// Exit code. + /// </summary> + public int ExitCode + { + get + { + return exitCode; + } + } + + /// <summary> + /// Run an excutable and redirect standard error and/or standard output safely. + /// </summary> + public RedirectableProcess(ProcessStartInfo processStartInfo) + { + Run(processStartInfo, null); + } + + /// <summary> + /// Run an excutable and redirect standard error and/or standard output safely. + /// </summary> + public RedirectableProcess(ProcessStartInfo processStartInfo, string input) + { + Run(processStartInfo, input); + } + + private void Run(ProcessStartInfo processStartInfo, string input) + { + process = new Process(); + process.StartInfo = processStartInfo; + process.Start(); + if (processStartInfo.RedirectStandardInput && input != null) + { + process.StandardInput.AutoFlush = true; + process.StandardInput.WriteLine(input); + } + Thread readStandardError = null; + if (processStartInfo.RedirectStandardError) + { + readStandardError = new Thread(new ThreadStart(ReadStandardError)); + readStandardError.Start(); + } + Thread readStandardOutput = null; + if (processStartInfo.RedirectStandardOutput) + { + readStandardOutput = new Thread(new ThreadStart(ReadStandardOutput)); + readStandardOutput.Start(); + } + if (processStartInfo.RedirectStandardError) + { + readStandardError.Join(); + } + if (processStartInfo.RedirectStandardOutput) + { + readStandardOutput.Join(); + } + process.WaitForExit(); + exitCode = process.ExitCode; + process = null; + } + + /// <summary> + /// Read standard error thread entry-point. + /// </summary> + private void ReadStandardError() + { + if (process != null) + { + processError = process.StandardError.ReadToEnd(); + } + } + + /// <summary> + /// Read standard output thread entry-point. + /// </summary> + private void ReadStandardOutput() + { + if (process != null) + { + processOutput = process.StandardOutput.ReadToEnd(); + } + } + } +}

18 years, 10 months

[sedwards] 19489: really remove the offending header this time

by sedwards＠svn.reactos.com

really remove the offending header this time Modified: trunk/reactos/apps/utils/net/tracert/tracert.c _____ Modified: trunk/reactos/apps/utils/net/tracert/tracert.c --- trunk/reactos/apps/utils/net/tracert/tracert.c 2005-11-23 15:52:21 UTC (rev 19488) +++ trunk/reactos/apps/utils/net/tracert/tracert.c 2005-11-23 16:57:00 UTC (rev 19489) @@ -28,7 +28,6 @@ */ -//#include <windows.h> #include <winsock2.h> #include <tchar.h> #include <stdio.h>

18 years, 10 months

[fireball] 19488: Translation by unC0Rr (slightly amended by me).

by fireball＠svn.reactos.com

Translation by unC0Rr (slightly amended by me). Modified: trunk/reactos/lib/aclui/aclui.rc Added: trunk/reactos/lib/aclui/aclui_Ru.rc _____ Modified: trunk/reactos/lib/aclui/aclui.rc --- trunk/reactos/lib/aclui/aclui.rc 2005-11-23 15:16:18 UTC (rev 19487) +++ trunk/reactos/lib/aclui/aclui.rc 2005-11-23 15:52:21 UTC (rev 19488) @@ -16,3 +16,4 @@ #include "aclui_Sv.rc" #include "aclui_Es.rc" #include "aclui_Pl.rc" +#include "aclui_Ru.rc" _____ Added: trunk/reactos/lib/aclui/aclui_Ru.rc --- trunk/reactos/lib/aclui/aclui_Ru.rc 2005-11-23 15:16:18 UTC (rev 19487) +++ trunk/reactos/lib/aclui/aclui_Ru.rc 2005-11-23 15:52:21 UTC (rev 19488) @@ -0,0 +1,28 @@ +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +IDD_SECPAGE DIALOGEX 0, 0, 227, 215 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE | WS_CAPTION +CAPTION "?Õþ¯´Ó±Ý¯±?³" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "&?ý Ò¾´´¹ ÞÙÞ ´¯Ù³þ¯ÔÓ?ÕÙ :", -1, 7, 7, 105, 8 + CONTROL "", IDC_PRINCIPALS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 7, 17, 213, 66, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE + PUSHBUTTON "?¯&ßÓÔÞ?³...", IDC_ADD_PRINCIPAL, 116, 87, 50, 14 + PUSHBUTTON "&ËõÓÙÞ?³", IDC_REMOVE_PRINCIPAL, 170, 87, 50, 14 + LTEXT "", IDC_LABEL_PERMISSIONS_FOR, 7, 107, 105, 8, SS_LEFT | SS_NOPREFIX + LTEXT "ðÓþÕ°Þ?³", IDC_LABEL_ALLOW, 130, 107, 40, 8, SS_CENTER + LTEXT "ÃÓ´Õ?Þ?³", IDC_LABEL_DENY, 176, 107, 40, 8, SS_CENTER + CONTROL "", IDC_ACE_CHECKLIST, "CHECKLIST_ACLUI", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 117, 213, 72, WS_EX_CLIENTEDGE + LTEXT "Î?¯ß¹ þÓõÓ?³ ¯±¯ß¹Õ ÓþÕ°ÕÝÞ ÞÙÞ ´ÓÓýÕ?¹, ÝÓµýÞ?Õ ²?¾ ÛÝ¯´Û¾:", IDC_LABEL_ADVANCED, 7, 194, 153, 16, SS_LEFT + PUSHBUTTON "?¯&´¯ÙÝÞ?ÕÙ³Ý¯", IDC_ADVANCED, 160, 194, 60, 14 +END + +STRINGTABLE DISCARDABLE +{ + IDS_PSP_TITLE "ðÓþÕ°ÕÝÞ õÙ %1" + IDS_UNKNOWN "?ÕÞþÔÕ±?Ý¹Ú" + IDS_SPECIAL_PERMISSIONS "?±¯ß¹Õ ÓþÕ°ÕÝÞ " + IDS_PERMISSIONS_FOR "ðÓþÕ°ÕÝÞ õÙ %1" + IDS_PERMISSIONS "ðÓþÕ°ÕÝÞ " +} + Property changes on: trunk/reactos/lib/aclui/aclui_Ru.rc ___________________________________________________________________ Name: svn:eol-style + native

18 years, 10 months

[chorns] 19487: Fix building rbuild tests

by chorns＠svn.reactos.com

Fix building rbuild tests Modified: trunk/reactos/tools/rbuild/tests/cdfiletest.cpp Modified: trunk/reactos/tools/rbuild/tests/compilationunittest.cpp Modified: trunk/reactos/tools/rbuild/tests/data/compilationunit.xml Modified: trunk/reactos/tools/rbuild/tests/definetest.cpp Modified: trunk/reactos/tools/rbuild/tests/iftest.cpp Modified: trunk/reactos/tools/rbuild/tests/includetest.cpp Modified: trunk/reactos/tools/rbuild/tests/invoketest.cpp Modified: trunk/reactos/tools/rbuild/tests/linkerflagtest.cpp Modified: trunk/reactos/tools/rbuild/tests/moduletest.cpp Modified: trunk/reactos/tools/rbuild/tests/projecttest.cpp Modified: trunk/reactos/tools/rbuild/tests/sourcefiletest.cpp Modified: trunk/reactos/tools/rbuild/tests/symboltest.cpp _____ Modified: trunk/reactos/tools/rbuild/tests/cdfiletest.cpp --- trunk/reactos/tools/rbuild/tests/cdfiletest.cpp 2005-11-23 15:05:53 UTC (rev 19486) +++ trunk/reactos/tools/rbuild/tests/cdfiletest.cpp 2005-11-23 15:16:18 UTC (rev 19487) @@ -22,7 +22,8 @@ void CDFileTest::Run() { string projectFilename ( RBUILD_BASE "tests/data/cdfile.xml" ); - Project project( projectFilename ); + Configuration configuration; + Project project ( configuration, projectFilename ); ARE_EQUAL ( 3, project.cdfiles.size () ); CDFile& cdfile1 = *project.cdfiles[0]; _____ Modified: trunk/reactos/tools/rbuild/tests/compilationunittest.cpp --- trunk/reactos/tools/rbuild/tests/compilationunittest.cpp 2005-11-23 15:05:53 UTC (rev 19486) +++ trunk/reactos/tools/rbuild/tests/compilationunittest.cpp 2005-11-23 15:16:18 UTC (rev 19487) @@ -22,7 +22,8 @@ void CompilationUnitTest::Run() { string projectFilename ( RBUILD_BASE "tests/data/compilationunit.xml" ); - Project project ( projectFilename ); + Configuration configuration; + Project project ( configuration, projectFilename ); ARE_EQUAL ( 1, project.modules.size () ); Module& module1 = *project.modules[0]; _____ Modified: trunk/reactos/tools/rbuild/tests/data/compilationunit.xml --- trunk/reactos/tools/rbuild/tests/data/compilationunit.xml 2005-11-23 15:05:53 UTC (rev 19486) +++ trunk/reactos/tools/rbuild/tests/data/compilationunit.xml 2005-11-23 15:16:18 UTC (rev 19487) @@ -2,7 +2,7 @@ <project name="Project" makefile="Makefile"> <directory name="dir1"> <module name="module1" type="buildtool"> - <compilationunit> + <compilationunit name="module1_unit.c"> <file>file1.c</file> <file>file2.c</file> </compilationunit> _____ Modified: trunk/reactos/tools/rbuild/tests/definetest.cpp --- trunk/reactos/tools/rbuild/tests/definetest.cpp 2005-11-23 15:05:53 UTC (rev 19486) +++ trunk/reactos/tools/rbuild/tests/definetest.cpp 2005-11-23 15:16:18 UTC (rev 19487) @@ -22,7 +22,8 @@ void DefineTest::Run() { string projectFilename ( RBUILD_BASE "tests/data/define.xml" ); - Project project ( projectFilename ); + Configuration configuration; + Project project ( configuration, projectFilename ); ARE_EQUAL(1, project.non_if_data.defines.size()); Define& define1 = *project.non_if_data.defines[0]; ARE_EQUAL("define1", define1.name); _____ Modified: trunk/reactos/tools/rbuild/tests/iftest.cpp --- trunk/reactos/tools/rbuild/tests/iftest.cpp 2005-11-23 15:05:53 UTC (rev 19486) +++ trunk/reactos/tools/rbuild/tests/iftest.cpp 2005-11-23 15:16:18 UTC (rev 19487) @@ -60,7 +60,8 @@ IfTest::Run () { string projectFilename ( RBUILD_BASE "tests/data/if.xml" ); - Project project ( projectFilename ); + Configuration configuration; + Project project ( configuration, projectFilename ); TestProjectIf ( project ); TestModuleIf ( project ); _____ Modified: trunk/reactos/tools/rbuild/tests/includetest.cpp --- trunk/reactos/tools/rbuild/tests/includetest.cpp 2005-11-23 15:05:53 UTC (rev 19486) +++ trunk/reactos/tools/rbuild/tests/includetest.cpp 2005-11-23 15:16:18 UTC (rev 19487) @@ -22,7 +22,8 @@ void IncludeTest::Run() { string projectFilename ( RBUILD_BASE "tests/data/include.xml" ); - Project project ( projectFilename ); + Configuration configuration; + Project project ( configuration, projectFilename ); ARE_EQUAL(1, project.non_if_data.includes.size()); Include& include1 = *project.non_if_data.includes[0]; ARE_EQUAL("include1", include1.directory); _____ Modified: trunk/reactos/tools/rbuild/tests/invoketest.cpp --- trunk/reactos/tools/rbuild/tests/invoketest.cpp 2005-11-23 15:05:53 UTC (rev 19486) +++ trunk/reactos/tools/rbuild/tests/invoketest.cpp 2005-11-23 15:16:18 UTC (rev 19487) @@ -22,7 +22,8 @@ void InvokeTest::Run() { string projectFilename ( RBUILD_BASE "tests/data/invoke.xml" ); - Project project ( projectFilename ); + Configuration configuration; + Project project ( configuration, projectFilename ); ARE_EQUAL(1, project.modules.size()); Module& module1 = *project.modules[0]; _____ Modified: trunk/reactos/tools/rbuild/tests/linkerflagtest.cpp --- trunk/reactos/tools/rbuild/tests/linkerflagtest.cpp 2005-11-23 15:05:53 UTC (rev 19486) +++ trunk/reactos/tools/rbuild/tests/linkerflagtest.cpp 2005-11-23 15:16:18 UTC (rev 19487) @@ -22,7 +22,8 @@ void LinkerFlagTest::Run() { string projectFilename ( RBUILD_BASE "tests/data/linkerflag.xml" ); - Project project ( projectFilename ); + Configuration configuration; + Project project ( configuration, projectFilename ); ARE_EQUAL(1, project.linkerFlags.size()); LinkerFlag& linkerFlag1 = *project.linkerFlags[0]; ARE_EQUAL("-lgcc1", linkerFlag1.flag); _____ Modified: trunk/reactos/tools/rbuild/tests/moduletest.cpp --- trunk/reactos/tools/rbuild/tests/moduletest.cpp 2005-11-23 15:05:53 UTC (rev 19486) +++ trunk/reactos/tools/rbuild/tests/moduletest.cpp 2005-11-23 15:16:18 UTC (rev 19487) @@ -22,7 +22,8 @@ void ModuleTest::Run() { string projectFilename ( RBUILD_BASE "tests/data/module.xml" ); - Project project ( projectFilename ); + Configuration configuration; + Project project ( configuration, projectFilename ); ARE_EQUAL(2, project.modules.size()); Module& module1 = *project.modules[0]; _____ Modified: trunk/reactos/tools/rbuild/tests/projecttest.cpp --- trunk/reactos/tools/rbuild/tests/projecttest.cpp 2005-11-23 15:05:53 UTC (rev 19486) +++ trunk/reactos/tools/rbuild/tests/projecttest.cpp 2005-11-23 15:16:18 UTC (rev 19487) @@ -22,6 +22,7 @@ void ProjectTest::Run() { string projectFilename ( RBUILD_BASE "tests/data/project.xml" ); - Project project( projectFilename ); + Configuration configuration; + Project project ( configuration, projectFilename ); ARE_EQUAL(2, project.modules.size()); } _____ Modified: trunk/reactos/tools/rbuild/tests/sourcefiletest.cpp --- trunk/reactos/tools/rbuild/tests/sourcefiletest.cpp 2005-11-23 15:05:53 UTC (rev 19486) +++ trunk/reactos/tools/rbuild/tests/sourcefiletest.cpp 2005-11-23 15:16:18 UTC (rev 19487) @@ -51,7 +51,9 @@ void SourceFileTest::IncludeTest () { - const Project project ( RBUILD_BASE "tests" SSEP "data" SSEP "automaticdependency_include.xml" ); + const string projectFilename = RBUILD_BASE "tests" SSEP "data" SSEP "automaticdependency_include.xml"; + Configuration configuration; + Project project ( configuration, projectFilename ); AutomaticDependency automaticDependency ( project ); automaticDependency.ParseFiles (); ARE_EQUAL( 4, automaticDependency.sourcefile_map.size () ); @@ -64,7 +66,9 @@ void SourceFileTest::FullParseTest () { - const Project project ( RBUILD_BASE "tests" SSEP "data" SSEP "automaticdependency.xml" ); + const string projectFilename = RBUILD_BASE "tests" SSEP "data" SSEP "automaticdependency.xml"; + Configuration configuration; + Project project ( configuration, projectFilename ); AutomaticDependency automaticDependency ( project ); automaticDependency.ParseFiles (); ARE_EQUAL( 5, automaticDependency.sourcefile_map.size () ); _____ Modified: trunk/reactos/tools/rbuild/tests/symboltest.cpp --- trunk/reactos/tools/rbuild/tests/symboltest.cpp 2005-11-23 15:05:53 UTC (rev 19486) +++ trunk/reactos/tools/rbuild/tests/symboltest.cpp 2005-11-23 15:16:18 UTC (rev 19487) @@ -22,7 +22,8 @@ void SymbolTest::Run() { string projectFilename ( RBUILD_BASE "tests/data/symbol.xml" ); - Project project ( projectFilename ); + Configuration configuration; + Project project ( configuration, projectFilename ); ARE_EQUAL ( 1, project.modules.size () ); Module& module1 = *project.modules[0];

18 years, 10 months

[chorns] 19486: Disable pre-compiled headers when using compilation units

by chorns＠svn.reactos.com

Disable pre-compiled headers when using compilation units Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.h Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h Modified: trunk/reactos/tools/rbuild/compilationunitsupportcode.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-11-23 13:45:34 UTC (rev 19485) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-11-23 15:05:53 UTC (rev 19486) @@ -89,6 +89,42 @@ return directoryTree->name; } +bool +MingwBackend::CanEnablePreCompiledHeaderSupportForModule ( const Module& module ) +{ + if ( !configuration.CompilationUnitsEnabled ) + return true; + + const vector<CompilationUnit*>& compilationUnits = module.non_if_data.compilationUnits; + size_t i; + for ( i = 0; i < compilationUnits.size (); i++ ) + { + CompilationUnit& compilationUnit = *compilationUnits[i]; + if ( compilationUnit.files.size () != 1 ) + return false; + } + // intentionally make a copy so that we can append more work in + // the middle of processing without having to go recursive + vector<If*> v = module.non_if_data.ifs; + for ( i = 0; i < v.size (); i++ ) + { + size_t j; + If& rIf = *v[i]; + // check for sub-ifs to add to list + const vector<If*>& ifs = rIf.data.ifs; + for ( j = 0; j < ifs.size (); j++ ) + v.push_back ( ifs[j] ); + const vector<CompilationUnit*>& compilationUnits = rIf.data.compilationUnits; + for ( j = 0; j < compilationUnits.size (); j++ ) + { + CompilationUnit& compilationUnit = *compilationUnits[j]; + if ( compilationUnit.files.size () != 1 ) + return false; + } + } + return true; +} + void MingwBackend::ProcessModules () { @@ -104,6 +140,8 @@ MingwModuleHandler* h = MingwModuleHandler::InstanciateHandler ( module, this ); + if ( use_pch && CanEnablePreCompiledHeaderSupportForModule ( module ) ) + h->EnablePreCompiledHeaderSupport (); if ( module.host == HostDefault ) { module.host = h->DefaultHost(); @@ -207,7 +245,6 @@ throw AccessDeniedException ( ProjectNode.makefile ); MingwModuleHandler::SetBackend ( this ); MingwModuleHandler::SetMakefile ( fMakefile ); - MingwModuleHandler::SetUsePch ( use_pch ); } void _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.h --- trunk/reactos/tools/rbuild/backend/mingw/mingw.h 2005-11-23 13:45:34 UTC (rev 19485) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.h 2005-11-23 15:05:53 UTC (rev 19486) @@ -92,6 +92,7 @@ void DetectNetwideAssembler (); void DetectPipeSupport (); void DetectPCHSupport (); + bool CanEnablePreCompiledHeaderSupportForModule ( const Module& module ); void ProcessModules (); void CheckAutomaticDependenciesForModuleOnly (); void ProcessNormal (); _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-11-23 13:45:34 UTC (rev 19485) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-11-23 15:05:53 UTC (rev 19486) @@ -32,8 +32,6 @@ MingwModuleHandler::backend = NULL; FILE* MingwModuleHandler::fMakefile = NULL; -bool -MingwModuleHandler::use_pch = false; string PrefixFilename ( @@ -73,6 +71,7 @@ : module(module_) { + use_pch = false; } MingwModuleHandler::~MingwModuleHandler() @@ -91,10 +90,10 @@ fMakefile = f; } -/*static*/ void -MingwModuleHandler::SetUsePch ( bool b ) +void +MingwModuleHandler::EnablePreCompiledHeaderSupport () { - use_pch = b; + use_pch = true; } /* static*/ string _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h 2005-11-23 13:45:34 UTC (rev 19485) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h 2005-11-23 15:05:53 UTC (rev 19486) @@ -39,7 +39,7 @@ static void SetBackend ( MingwBackend* backend_ ); static void SetMakefile ( FILE* f ); - static void SetUsePch ( bool use_pch ); + void EnablePreCompiledHeaderSupport (); static std::string PassThruCacheDirectory ( const std::string &f, @@ -125,7 +125,7 @@ std::string GetLinkingDependencies () const; static MingwBackend* backend; static FILE* fMakefile; - static bool use_pch; + bool use_pch; private: std::string ConcatenatePaths ( const std::string& path1, const std::string& path2 ) const; _____ Modified: trunk/reactos/tools/rbuild/compilationunitsupportcode.cpp --- trunk/reactos/tools/rbuild/compilationunitsupportcode.cpp 2005-11-23 13:45:34 UTC (rev 19485) +++ trunk/reactos/tools/rbuild/compilationunitsupportcode.cpp 2005-11-23 15:05:53 UTC (rev 19486) @@ -82,8 +82,6 @@ s = buf; s = s + sprintf ( s, "/* This file is automatically generated. */\n" ); s = s + sprintf ( s, "#define ONE_COMPILATION_UNIT\n" ); - if ( module.pch ) - s = s + sprintf ( s, "#include <%s>\n", ChangeSeparator ( module.pch->file.name, '\\', '/' ).c_str () ); for ( size_t i = 0; i < compilationUnit.files.size () ; i++ ) {

18 years, 10 months

[hpoussin] 19485: In NtUserInsertMenuItem, try to copy the whole MENUITEMINFOW structure from caller. If it fails, try without the last field

by hpoussin＠svn.reactos.com

In NtUserInsertMenuItem, try to copy the whole MENUITEMINFOW structure from caller. If it fails, try without the last field Modified: trunk/reactos/subsys/win32k/ntuser/menu.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/menu.c --- trunk/reactos/subsys/win32k/ntuser/menu.c 2005-11-23 13:13:09 UTC (rev 19484) +++ trunk/reactos/subsys/win32k/ntuser/menu.c 2005-11-23 13:45:34 UTC (rev 19485) @@ -907,7 +907,7 @@ pos = IntInsertMenuItemToList(MenuObject, MenuItem, pos); - DPRINT("IntInsertMenuItemToList = %i\n", pos); + DPRINT("IntInsertMenuItemToList = %i\n", pos); return (pos >= 0); } @@ -1554,24 +1554,37 @@ if(!(Menu = UserGetMenuObject(hMenu))) { - RETURN(0); + RETURN( FALSE); } + /* Try to copy the whole MENUITEMINFOW structure */ Status = MmCopyFromCaller(&ItemInfo, UnsafeItemInfo, sizeof(MENUITEMINFOW)); - if (! NT_SUCCESS(Status)) + if (NT_SUCCESS(Status)) { - SetLastNtError(Status); - RETURN( FALSE); + if (sizeof(MENUITEMINFOW) != ItemInfo.cbSize + && FIELD_OFFSET(MENUITEMINFOW, hbmpItem) != ItemInfo.cbSize) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + RETURN( FALSE); + } + RETURN( IntInsertMenuItem(Menu, uItem, fByPosition, &ItemInfo)); } - /* structure can be 44 bytes or 48 bytes in size - if (ItemInfo.cbSize != sizeof(MENUITEMINFOW)) + + /* Try to copy without last field (not present in older versions) */ + Status = MmCopyFromCaller(&ItemInfo, UnsafeItemInfo, FIELD_OFFSET(MENUITEMINFOW, hbmpItem)); + if (NT_SUCCESS(Status)) { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - RETURN( FALSE); + if (FIELD_OFFSET(MENUITEMINFOW, hbmpItem) != ItemInfo.cbSize) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + RETURN( FALSE); + } + ItemInfo.hbmpItem = (HBITMAP)0; + RETURN( IntInsertMenuItem(Menu, uItem, fByPosition, &ItemInfo)); } - */ - RETURN( IntInsertMenuItem(Menu, uItem, fByPosition, &ItemInfo)); + SetLastNtError(Status); + RETURN( FALSE); CLEANUP: DPRINT("Leave NtUserInsertMenuItem, ret=%i\n",_ret_); @@ -1955,7 +1968,7 @@ return( FALSE); } if (sizeof(MENUITEMINFOW) != Size - && sizeof(MENUITEMINFOW) - sizeof(HBITMAP) != Size + && FIELD_OFFSET(MENUITEMINFOW, hbmpItem) != Size && sizeof(ROSMENUITEMINFO) != Size) { SetLastWin32Error(ERROR_INVALID_PARAMETER); @@ -1969,7 +1982,7 @@ } /* If this is a pre-0x0500 _WIN32_WINNT MENUITEMINFOW, you can't set/get hbmpItem */ - if (sizeof(MENUITEMINFOW) - sizeof(HBITMAP) == Size + if (FIELD_OFFSET(MENUITEMINFOW, hbmpItem) == Size && 0 != (ItemInfo.fMask & MIIM_BITMAP)) { SetLastWin32Error(ERROR_INVALID_PARAMETER);

18 years, 10 months

[cwittich] 19484: fixed bug 888 (menus created by application itself may not appear)

by cwittich＠svn.reactos.com

fixed bug 888 (menus created by application itself may not appear) Modified: trunk/reactos/subsys/win32k/ntuser/menu.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/menu.c --- trunk/reactos/subsys/win32k/ntuser/menu.c 2005-11-23 07:07:40 UTC (rev 19483) +++ trunk/reactos/subsys/win32k/ntuser/menu.c 2005-11-23 13:13:09 UTC (rev 19484) @@ -907,7 +907,9 @@ pos = IntInsertMenuItemToList(MenuObject, MenuItem, pos); - return pos >= 0; + DPRINT("IntInsertMenuItemToList = %i\n", pos); + + return (pos >= 0); } UINT FASTCALL @@ -1561,11 +1563,13 @@ SetLastNtError(Status); RETURN( FALSE); } + /* structure can be 44 bytes or 48 bytes in size if (ItemInfo.cbSize != sizeof(MENUITEMINFOW)) { SetLastWin32Error(ERROR_INVALID_PARAMETER); RETURN( FALSE); } + */ RETURN( IntInsertMenuItem(Menu, uItem, fByPosition, &ItemInfo));

18 years, 10 months

[navaraf] 19483: Update GPL and LGPL licenses.

by navaraf＠svn.reactos.com

Update GPL and LGPL licenses. Modified: trunk/reactos/COPYING Modified: trunk/reactos/LGPL.txt _____ Modified: trunk/reactos/COPYING --- trunk/reactos/COPYING 2005-11-23 06:33:19 UTC (rev 19482) +++ trunk/reactos/COPYING 2005-11-23 07:07:40 UTC (rev 19483) @@ -3,7 +3,7 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 675 Mass Ave, Cambridge, MA 02139, USA + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -280,7 +280,7 @@ END OF TERMS AND CONDITIONS - Appendix: How to Apply These Terms to Your New Programs + How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it @@ -292,7 +292,7 @@ the "copyright" line and a pointer to where the full notice is found. <one line to give the program's name and a brief idea of what it does.> - Copyright (C) 19yy <name of author> + Copyright (C) <year> <name of author> 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 @@ -306,14 +306,15 @@ 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. + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Also add information on how to contact you by electronic and paper mail. If the program is interactive, make it output a short notice like this when it starts in an interactive mode: - Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. _____ Modified: trunk/reactos/LGPL.txt --- trunk/reactos/LGPL.txt 2005-11-23 06:33:19 UTC (rev 19482) +++ trunk/reactos/LGPL.txt 2005-11-23 07:07:40 UTC (rev 19483) @@ -2,7 +2,7 @@ Version 2.1, February 1999 Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -485,7 +485,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Also add information on how to contact you by electronic and paper mail.

18 years, 10 months

← Newer
1
...
28
29
30
31
32
33
34
...
88
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2005