diff options
56 files changed, 196 insertions, 1255 deletions
@@ -61,7 +61,7 @@ This is Mono. If you are upgrading from CVS you will need an existing Mono installation. First verify that you have a working installation: - echo 'class X { static void Main () { System.Console.Write("OK");}}' > x.cs + echo 'class X { static void Main () { System.Console.Write("OK");}'}' > x.cs Compile: diff --git a/config.h.in b/config.h.in deleted file mode 100644 index b412155c227..00000000000 --- a/config.h.in +++ /dev/null @@ -1,51 +0,0 @@ -/* config.h.in. Generated automatically from configure.in by autoheader 2.13. */ - -/* Define if you have the ANSI C header files. */ -#undef STDC_HEADERS - -#undef HAVE_INET_PTON -#undef HAVE_INET_ATON -#undef HAVE_SOL_IP -#undef HAVE_SOL_TCP -#undef HAVE_IP_PKTINFO -#undef HAVE_STRUCT_IP_MREQN -#undef HAVE_PTHREAD -#undef HAVE_PTHREAD_MUTEX_TIMEDLOCK -#undef USE_MONO_MUTEX -#undef HAVE_LARGE_FILE_SUPPORT -#undef PLATFORM_WIN32 -#undef HAVE_NEW_ICONV -#undef NAME_DEV_RANDOM -#undef HAVE_CRYPT_RNG -#undef HAVE_BOEHM_GC - -/* The number of bytes in a void *. */ -#undef SIZEOF_VOID_P - -/* Define if you have the inet_aton function. */ -#undef HAVE_INET_ATON - -/* Define if you have the inet_pton function. */ -#undef HAVE_INET_PTON - -/* Define if you have the <dlfcn.h> header file. */ -#undef HAVE_DLFCN_H - -/* Define if you have the <netdb.h> header file. */ -#undef HAVE_NETDB_H - -/* Define if you have the <sys/filio.h> header file. */ -#undef HAVE_SYS_FILIO_H - -/* Define if you have the <sys/sockio.h> header file. */ -#undef HAVE_SYS_SOCKIO_H - -/* Define if you have the <utime.h> header file. */ -#undef HAVE_UTIME_H - -/* Name of package */ -#undef PACKAGE - -/* Version number of package */ -#undef VERSION - diff --git a/doc/crypto b/doc/crypto index aca4750470d..8080eb67709 100644 --- a/doc/crypto +++ b/doc/crypto @@ -374,7 +374,11 @@ algorithm ;-). * Write some documentation on the cryptographic classes for - <b>monodoc</b>. + <b>monodoc</b> as I'm not a very good writer (at least in English). </ul> + + Contact <a href="mailto:spouliot@videotron.ca">Sebastien Pouliot</a> if + you need additional informations about the status of the cryptographic + classes. <hr> -Last reviewed: February 2, 2004 (mono 0.30) +Last reviewed: January 26, 2004 (post mono 0.29) diff --git a/doc/pending-classes.in b/doc/pending-classes.in deleted file mode 100644 index 1cdb5a4cb36..00000000000 --- a/doc/pending-classes.in +++ /dev/null @@ -1,246 +0,0 @@ -System.Object -System.Exception -System.ValueType -System.Delegate -System.MulticastDelegate -System.Enum -System.Activator -System.ArgIterator -System.__ComObject -System.TypedReference -System.Security.AllowPartiallyTrustedCallersAttribute -System.Runtime.Serialization.Formatter -System.Runtime.Serialization.FormatterConverter -System.Runtime.Serialization.FormatterServices -System.Runtime.Serialization.ObjectIDGenerator -System.Runtime.Serialization.ObjectManager -System.Reflection.ModuleResolveEventHandler -System.Reflection.Pointer -System.Globalization.CompareInfo -System.Globalization.HebrewCalendar -System.Globalization.HijriCalendar -System.Globalization.JapaneseCalendar -System.Globalization.KoreanCalendar -System.Globalization.SortKey -System.Globalization.StringInfo -System.Globalization.TaiwanCalendar -System.Globalization.TextElementEnumerator -System.Globalization.TextInfo -System.Globalization.ThaiBuddhistCalendar -System.IO.IsolatedStorage.IsolatedStorageFile -System.Reflection.Emit.MethodRental -System.Runtime.CompilerServices.AccessedThroughPropertyAttribute -System.Runtime.CompilerServices.CallConvCdecl -System.Runtime.CompilerServices.CallConvStdcall -System.Runtime.CompilerServices.CallConvThiscall -System.Runtime.CompilerServices.CallConvFastcall -System.Runtime.CompilerServices.CustomConstantAttribute -System.Runtime.CompilerServices.DateTimeConstantAttribute -System.Runtime.CompilerServices.DiscardableAttribute -System.Runtime.CompilerServices.DecimalConstantAttribute -System.Runtime.CompilerServices.CompilationRelaxationsAttribute -System.Runtime.CompilerServices.CompilerGlobalScopeAttribute -System.Runtime.CompilerServices.IDispatchConstantAttribute -System.Runtime.CompilerServices.IsVolatile -System.Runtime.CompilerServices.IUnknownConstantAttribute -System.Runtime.CompilerServices.RequiredAttributeAttribute -System.Runtime.InteropServices.ArrayWithOffset -System.Runtime.InteropServices.DispIdAttribute -System.Runtime.InteropServices.ClassInterfaceType -System.Runtime.InteropServices.ClassInterfaceAttribute -System.Runtime.InteropServices.ComVisibleAttribute -System.Runtime.InteropServices.LCIDConversionAttribute -System.Runtime.InteropServices.ComRegisterFunctionAttribute -System.Runtime.InteropServices.ComUnregisterFunctionAttribute -System.Runtime.InteropServices.ProgIdAttribute -System.Runtime.InteropServices.ImportedFromTypeLibAttribute -System.Runtime.InteropServices.IDispatchImplType -System.Runtime.InteropServices.IDispatchImplAttribute -System.Runtime.InteropServices.ComSourceInterfacesAttribute -System.Runtime.InteropServices.ComConversionLossAttribute -System.Runtime.InteropServices.TypeLibTypeFlags -System.Runtime.InteropServices.TypeLibFuncFlags -System.Runtime.InteropServices.TypeLibVarFlags -System.Runtime.InteropServices.TypeLibTypeAttribute -System.Runtime.InteropServices.TypeLibFuncAttribute -System.Runtime.InteropServices.TypeLibVarAttribute -System.Runtime.InteropServices.ComImportAttribute -System.Runtime.InteropServices.PreserveSigAttribute -System.Runtime.InteropServices.ComAliasNameAttribute -System.Runtime.InteropServices.AutomationProxyAttribute -System.Runtime.InteropServices.PrimaryInteropAssemblyAttribute -System.Runtime.InteropServices.CoClassAttribute -System.Runtime.InteropServices.ComEventInterfaceAttribute -System.Runtime.InteropServices.COMException -System.Runtime.InteropServices.ComMemberType -System.Runtime.InteropServices.CurrencyWrapper -System.Runtime.InteropServices.DispatchWrapper -System.Runtime.InteropServices.ErrorWrapper -System.Runtime.InteropServices.ExtensibleClassFactory -System.Runtime.InteropServices.HandleRef -System.Runtime.InteropServices.InvalidComObjectException -System.Runtime.InteropServices.InvalidOleVariantTypeException -System.Runtime.InteropServices.TypeLibImporterFlags -System.Runtime.InteropServices.ExporterEventKind -System.Runtime.InteropServices.ITypeLibExporterNotifySink -System.Runtime.InteropServices.ITypeLibConverter -System.Runtime.InteropServices.MarshalDirectiveException -System.Runtime.InteropServices.ObjectCreationDelegate -System.Runtime.InteropServices.RuntimeEnvironment -System.Runtime.InteropServices.RegistrationServices -System.Runtime.InteropServices.SafeArrayRankMismatchException -System.Runtime.InteropServices.SafeArrayTypeMismatchException -System.Runtime.InteropServices.SEHException -System.Runtime.InteropServices.TypeLibConverter -System.Runtime.InteropServices.BIND_OPTS -System.Runtime.InteropServices.UCOMIBindCtx -System.Runtime.InteropServices.UCOMIConnectionPointContainer -System.Runtime.InteropServices.UCOMIConnectionPoint -System.Runtime.InteropServices.UCOMIEnumMoniker -System.Runtime.InteropServices.CONNECTDATA -System.Runtime.InteropServices.UCOMIEnumConnections -System.Runtime.InteropServices.UCOMIEnumConnectionPoints -System.Runtime.InteropServices.UCOMIEnumString -System.Runtime.InteropServices.UCOMIEnumVARIANT -System.Runtime.InteropServices.FILETIME -System.Runtime.InteropServices.UCOMIMoniker -System.Runtime.InteropServices.UCOMIPersistFile -System.Runtime.InteropServices.UCOMIRunningObjectTable -System.Runtime.InteropServices.STATSTG -System.Runtime.InteropServices.UCOMIStream -System.Runtime.InteropServices.DESCKIND -System.Runtime.InteropServices.BINDPTR -System.Runtime.InteropServices.UCOMITypeComp -System.Runtime.InteropServices.TYPEKIND -System.Runtime.InteropServices.TYPEFLAGS -System.Runtime.InteropServices.IMPLTYPEFLAGS -System.Runtime.InteropServices.TYPEATTR -System.Runtime.InteropServices.FUNCDESC -System.Runtime.InteropServices.IDLFLAG -System.Runtime.InteropServices.IDLDESC -System.Runtime.InteropServices.PARAMFLAG -System.Runtime.InteropServices.PARAMDESC -System.Runtime.InteropServices.TYPEDESC -System.Runtime.InteropServices.ELEMDESC -System.Runtime.InteropServices.VARDESC -System.Runtime.InteropServices.DISPPARAMS -System.Runtime.InteropServices.EXCEPINFO -System.Runtime.InteropServices.FUNCKIND -System.Runtime.InteropServices.INVOKEKIND -System.Runtime.InteropServices.CALLCONV -System.Runtime.InteropServices.FUNCFLAGS -System.Runtime.InteropServices.VARFLAGS -System.Runtime.InteropServices.UCOMITypeInfo -System.Runtime.InteropServices.SYSKIND -System.Runtime.InteropServices.LIBFLAGS -System.Runtime.InteropServices.TYPELIBATTR -System.Runtime.InteropServices.UCOMITypeLib -System.Runtime.InteropServices.UnknownWrapper -System.Runtime.Remoting.IObjectHandle -System.Runtime.Remoting.IRemotingTypeInfo -System.Runtime.Remoting.IChannelInfo -System.Runtime.Remoting.IEnvoyInfo -System.Runtime.Remoting.RemotingConfiguration -System.Runtime.Remoting.TypeEntry -System.Runtime.Remoting.ActivatedClientTypeEntry -System.Runtime.Remoting.ActivatedServiceTypeEntry -System.Runtime.Remoting.WellKnownClientTypeEntry -System.Runtime.Remoting.WellKnownServiceTypeEntry -System.Runtime.Remoting.RemotingException -System.Runtime.Remoting.ServerException -System.Runtime.Remoting.RemotingTimeoutException -System.Runtime.Remoting.RemotingServices -System.Runtime.Remoting.InternalRemotingServices -System.Runtime.Remoting.SoapServices -System.Runtime.Remoting.Activation.UrlAttribute -System.Runtime.Remoting.Messaging.IMessageSink -System.Runtime.Remoting.Messaging.AsyncResult -System.Runtime.Remoting.Messaging.CallContext -System.Runtime.Remoting.Messaging.ILogicalThreadAffinative -System.Runtime.Remoting.Messaging.InternalMessageWrapper -System.Runtime.Remoting.Messaging.IMethodCallMessage -System.Runtime.Remoting.Messaging.MethodCallMessageWrapper -System.Runtime.Remoting.Messaging.HeaderHandler -System.Runtime.Remoting.Messaging.IMessageCtrl -System.Runtime.Remoting.Messaging.IRemotingFormatter -System.Runtime.Remoting.Messaging.ReturnMessage -System.Runtime.Remoting.Messaging.MethodCall -System.Runtime.Remoting.Messaging.ConstructionCall -System.Runtime.Remoting.Messaging.MethodResponse -System.Runtime.Remoting.Messaging.ConstructionResponse -System.Runtime.Remoting.Messaging.MethodReturnMessageWrapper -System.Runtime.Remoting.Messaging.OneWayAttribute -System.Runtime.Remoting.Messaging.MessageSurrogateFilter -System.Runtime.Remoting.Messaging.RemotingSurrogateSelector -System.Runtime.Remoting.Contexts.CrossContextDelegate -System.Runtime.Remoting.Contexts.ContextProperty -System.Runtime.Remoting.Contexts.IContextPropertyActivator -System.Runtime.Remoting.Contexts.IContributeClientContextSink -System.Runtime.Remoting.Contexts.IContributeDynamicSink -System.Runtime.Remoting.Contexts.IContributeEnvoySink -System.Runtime.Remoting.Contexts.IContributeObjectSink -System.Runtime.Remoting.Contexts.IContributeServerContextSink -System.Runtime.Serialization.Formatters.InternalRM -System.Runtime.Serialization.Formatters.InternalST -System.Runtime.Serialization.Formatters.SoapMessage -System.Runtime.Serialization.Formatters.SoapFault -System.Runtime.Serialization.Formatters.ServerFault -System.Runtime.Serialization.Formatters.Binary.BinaryFormatter -System.Security.Cryptography.CryptoConfig -System.Security.Cryptography.KeyedHashAlgorithm -System.Security.Cryptography.HMACSHA1 -System.Security.Cryptography.MACTripleDES -System.Security.Cryptography.MaskGenerationMethod -System.Security.Cryptography.PasswordDeriveBytes -System.Security.Cryptography.PKCS1MaskGenerationMethod -System.Security.Cryptography.RC2 -System.Security.Cryptography.RC2CryptoServiceProvider -System.Security.Cryptography.RSACryptoServiceProvider -System.Security.Cryptography.RSAOAEPKeyExchangeDeformatter -System.Security.Cryptography.RSAOAEPKeyExchangeFormatter -System.Security.Cryptography.RSAPKCS1KeyExchangeDeformatter -System.Security.Cryptography.RSAPKCS1KeyExchangeFormatter -System.Security.Cryptography.RSAPKCS1SignatureDeformatter -System.Security.Cryptography.RSAPKCS1SignatureFormatter -System.Security.Cryptography.SHA1Managed -System.Security.Cryptography.TripleDES -System.Security.Cryptography.TripleDESCryptoServiceProvider -System.Security.Permissions.EnvironmentPermission -System.Security.Permissions.FileDialogPermission -System.Security.Permissions.IsolatedStorageFilePermission -System.Security.Permissions.PrincipalPermissionAttribute -System.Security.Permissions.SecurityPermissionAttribute -System.Security.Permissions.PublisherIdentityPermissionAttribute -System.Security.Permissions.PublisherIdentityPermission -System.Security.Permissions.ReflectionPermission -System.Security.Permissions.RegistryPermission -System.Security.Permissions.PrincipalPermission -System.Security.Permissions.SiteIdentityPermission -System.Security.Permissions.StrongNameIdentityPermission -System.Security.Permissions.StrongNamePublicKeyBlob -System.Security.Permissions.UIPermission -System.Security.Permissions.UrlIdentityPermission -System.Security.Permissions.ZoneIdentityPermission -System.Security.Policy.ApplicationDirectory -System.Security.Policy.ApplicationDirectoryMembershipCondition -System.Security.Policy.FirstMatchCodeGroup -System.Security.Policy.Hash -System.Security.Policy.HashMembershipCondition -System.Security.Policy.NetCodeGroup -System.Security.Policy.PermissionRequestEvidence -System.Security.Policy.Publisher -System.Security.Policy.PublisherMembershipCondition -System.Security.Policy.Site -System.Security.Policy.SiteMembershipCondition -System.Security.Policy.StrongName -System.Security.Policy.StrongNameMembershipCondition -System.Security.Policy.UnionCodeGroup -System.Security.Policy.Url -System.Security.Policy.UrlMembershipCondition -System.Security.Policy.Zone -System.Security.Policy.ZoneMembershipCondition -System.Security.Principal.WindowsIdentity -System.Security.Principal.WindowsImpersonationContext -System.Security.Principal.WindowsPrincipal -System.Threading.CompressedStack -
diff --git a/doc/web/team.xml b/doc/web/team.xml index 73dae776c4c..6b7e7a7e1bf 100644 --- a/doc/web/team.xml +++ b/doc/web/team.xml @@ -562,13 +562,13 @@ </name> - <e-mail>sebastien at ximian dot com</e-mail> + <e-mail>spouliot@motus.com</e-mail> <image>spouliot.png</image> <location>Quebec City, Canada</location> - <organization>Novell Ximian</organization> + <organization>Motus Technologies</organization> <description>Cryptoman</description> diff --git a/docs/ir-desc b/docs/ir-desc deleted file mode 100644 index 25ad5c11564..00000000000 --- a/docs/ir-desc +++ /dev/null @@ -1,30 +0,0 @@ -Mono Intermediate Representation Documentation - -Operation: OP_LOCALLOC - inst_left: - The value - ins->inst_left = *sp; - ins->cil_code = ip; - - This is the equivalent of alloca() in a C implementation: it - allocates a bunch of bytes on the stack dynamically. Local - variables are allocated statically in the stack instead. - - It is implemented by moving the stack pointer according to the - platform ABI: you may need to keep a specific frame register - to address local variables when LOCALLOC is used (the PPC code - does this, for example: ifyou're doing the s390 port I suggest - starting from that) - -Operation: OP_CALL_HANDLER. - - cil_code: - Points to the CIL where the LEAVE or LEAVE_S - instruction was found. - - inst_target_bb: - The target basic block for this invocation. - - This instruction must call the target basic block. - -
\ No newline at end of file diff --git a/mcs/class/System.Data/System.Data/ChangeLog b/mcs/class/System.Data/System.Data/ChangeLog index beff96380be..1c8219543e1 100644 --- a/mcs/class/System.Data/System.Data/ChangeLog +++ b/mcs/class/System.Data/System.Data/ChangeLog @@ -1,13 +1,3 @@ -2004-02-02 Eran Domb <erand@mainsoft.com> - - * DataSet.cs : Add indentation to the xml serialization only if we create the XmlWriter. - Add the namespace attribute even if namespace is an empty string for inteoperability with MS.NET. - * DataTable.cs (NewRow): Create only one DataRowBuilder. - Initiate new row with row id -1. - * DataRow.cs : Add RowId property. - * DataRowBuilder.cs : Add _rowId member. - * DataRowCollection.cs (Add) : Use the RowId property of the new row to check if it is already exists in the collection. - 2004-01-26 Eran Domb <erand@mainsoft.com> * XmlConstants.cs : Added some constants. diff --git a/mcs/class/System.Data/System.Data/DataRow.cs b/mcs/class/System.Data/System.Data/DataRow.cs index 3e83898e4d7..d20bf7d1028 100644 --- a/mcs/class/System.Data/System.Data/DataRow.cs +++ b/mcs/class/System.Data/System.Data/DataRow.cs @@ -41,7 +41,6 @@ namespace System.Data { private bool editing = false; private bool _hasParentCollection; private bool _inChangingEvent; - private int _rowId; #endregion @@ -54,8 +53,6 @@ namespace System.Data { protected internal DataRow (DataRowBuilder builder) { _table = builder.Table; - // Get the row id from the builder. - _rowId = builder._rowId; original = null; @@ -418,7 +415,6 @@ namespace System.Data { //from a Datatable so I added this method. Delete if there is a better way. internal void DetachRow() { proposed = null; - _rowId = -1; _hasParentCollection = false; rowState = DataRowState.Detached; } @@ -438,14 +434,6 @@ namespace System.Data { get { return xmlRowID; } set { xmlRowID = value; } } - - /// <summary> - /// Gets and sets index of row. - // </summary> - internal int RowID { - get { return _rowId; } - set { _rowId = value; } - } #endregion diff --git a/mcs/class/System.Data/System.Data/DataRowBuilder.cs b/mcs/class/System.Data/System.Data/DataRowBuilder.cs index 8e5b6e24abc..0e78cee8028 100644 --- a/mcs/class/System.Data/System.Data/DataRowBuilder.cs +++ b/mcs/class/System.Data/System.Data/DataRowBuilder.cs @@ -24,7 +24,6 @@ namespace System.Data #region Fields private DataTable table; - internal int _rowId; #endregion @@ -34,10 +33,9 @@ namespace System.Data // DataTable and two Int32. For consistency, this // class will also take those arguments. - internal DataRowBuilder (DataTable table, Int32 rowID, Int32 y) + internal DataRowBuilder (DataTable table, Int32 x, Int32 y) { this.table = table; - this._rowId = rowID; } #endregion diff --git a/mcs/class/System.Data/System.Data/DataRowCollection.cs b/mcs/class/System.Data/System.Data/DataRowCollection.cs index 7b84e003b97..3ef0a0ae105 100644 --- a/mcs/class/System.Data/System.Data/DataRowCollection.cs +++ b/mcs/class/System.Data/System.Data/DataRowCollection.cs @@ -64,9 +64,8 @@ namespace System.Data if (row.Table != this.table) throw new ArgumentException ("This row already belongs to another table."); - - // If row id is not -1, we know that it is in the collection. - if (row.RowID != -1) + + if (list.IndexOf(row) != -1) throw new ArgumentException ("This row already belongs to this table."); @@ -76,8 +75,6 @@ namespace System.Data row.HasParentCollection = true; list.Add (row); - // Set the row id. - row.RowID = list.Count - 1; row.AttachRow (); row.Table.ChangedDataRow (row, DataRowAction.Add); } diff --git a/mcs/class/System.Data/System.Data/DataSet.cs b/mcs/class/System.Data/System.Data/DataSet.cs index a35c92d1cc6..23694fbd857 100644 --- a/mcs/class/System.Data/System.Data/DataSet.cs +++ b/mcs/class/System.Data/System.Data/DataSet.cs @@ -564,8 +564,8 @@ namespace System.Data { public void WriteXml (Stream stream) { - XmlTextWriter writer = new XmlTextWriter (stream, null); - writer.Formatting = Formatting.Indented; + XmlWriter writer = new XmlTextWriter (stream, null); + WriteXml (writer); } @@ -575,8 +575,8 @@ namespace System.Data { /// <param name="filename">Fully qualified filename to write to</param> public void WriteXml (string fileName) { - XmlTextWriter writer = new XmlTextWriter (fileName, null); - writer.Formatting = Formatting.Indented; + XmlWriter writer = new XmlTextWriter (fileName, null); + WriteXml (writer); writer.Close (); @@ -584,8 +584,8 @@ namespace System.Data { public void WriteXml (TextWriter writer) { - XmlTextWriter xwriter = new XmlTextWriter (writer); - xwriter.Formatting = Formatting.Indented; + XmlWriter xwriter = new XmlTextWriter (writer); + WriteXml (xwriter); } @@ -596,22 +596,20 @@ namespace System.Data { public void WriteXml (string filename, XmlWriteMode mode) { - XmlTextWriter writer = new XmlTextWriter (filename, null); - writer.Formatting = Formatting.Indented; + XmlWriter writer = new XmlTextWriter (filename, null); WriteXml (writer, mode, true); } public void WriteXml (Stream stream, XmlWriteMode mode) { - XmlTextWriter writer = new XmlTextWriter (stream, null); - writer.Formatting = Formatting.Indented; + XmlWriter writer = new XmlTextWriter (stream, null); + WriteXml (writer, mode, true); } public void WriteXml (TextWriter writer, XmlWriteMode mode) { - XmlTextWriter xwriter = new XmlTextWriter (writer); - xwriter.Formatting = Formatting.Indented; + XmlWriter xwriter = new XmlTextWriter (writer); WriteXml (xwriter, mode, true); } @@ -622,15 +620,15 @@ namespace System.Data { internal void WriteXml (Stream stream, XmlWriteMode mode, bool writePI) { - XmlTextWriter writer = new XmlTextWriter (stream, null); - writer.Formatting = Formatting.Indented; + XmlWriter writer = new XmlTextWriter (stream, null); + WriteXml (writer, mode, writePI); } internal void WriteXml (string fileName, XmlWriteMode mode, bool writePI) { - XmlTextWriter writer = new XmlTextWriter (fileName, null); - writer.Formatting = Formatting.Indented; + XmlWriter writer = new XmlTextWriter (fileName, null); + WriteXml (writer, mode, writePI); writer.Close (); @@ -638,8 +636,8 @@ namespace System.Data { internal void WriteXml (TextWriter writer, XmlWriteMode mode, bool writePI) { - XmlTextWriter xwriter = new XmlTextWriter (writer); - xwriter.Formatting = Formatting.Indented; + XmlWriter xwriter = new XmlTextWriter (writer); + WriteXml (xwriter, mode, writePI); } @@ -648,22 +646,14 @@ namespace System.Data { if (writePI && (writer.WriteState == WriteState.Start)) writer.WriteStartDocument (true); + ((XmlTextWriter)writer).Formatting = Formatting.Indented; + if (mode == XmlWriteMode.DiffGram) { SetRowsID(); WriteDiffGramElement(writer); } WriteStartElement (writer, mode, Namespace, Prefix, XmlConvert.EncodeName (DataSetName)); - - /********************************************************* - * This is a patch for interoperability with ms.net. * - * Because in web services the .net client expects this * - * atrribute even if namespace is an empty string * - ********************************************************/ - if (Namespace == null || Namespace.Length == 0) - WriteAttributeString (writer, mode, null, null, "xmlns", Namespace); - - if (mode == XmlWriteMode.WriteSchema) { DoWriteXmlSchema (writer); } @@ -684,30 +674,32 @@ namespace System.Data { public void WriteXmlSchema (Stream stream) { - XmlTextWriter writer = new XmlTextWriter (stream, null ); - writer.Formatting = Formatting.Indented; + XmlWriter writer = new XmlTextWriter (stream, null ); + WriteXmlSchema (writer); } public void WriteXmlSchema (string fileName) { - XmlTextWriter writer = new XmlTextWriter (fileName, null); - writer.Formatting = Formatting.Indented; + XmlWriter writer = new XmlTextWriter (fileName, null); + WriteXmlSchema (writer); } public void WriteXmlSchema (TextWriter writer) { - XmlTextWriter xwriter = new XmlTextWriter (writer); - xwriter.Formatting = Formatting.Indented; + XmlWriter xwriter = new XmlTextWriter (writer); + WriteXmlSchema (xwriter); } public void WriteXmlSchema (XmlWriter writer) { + ((XmlTextWriter)writer).Formatting = Formatting.Indented; //Create a skeleton doc and then write the schema //proper which is common to the WriteXml method in schema mode writer.WriteStartDocument (); + DoWriteXmlSchema (writer); writer.WriteEndDocument (); @@ -1157,16 +1149,34 @@ namespace System.Data { } private void WriteStartElement (XmlWriter writer, XmlWriteMode mode, string nspc, string prefix, string name) - { - if (nspc == null || nspc == "") { - writer.WriteStartElement (name); - } - else if (prefix != null) { - writer.WriteStartElement (prefix, name, nspc); - } - else { - writer.WriteStartElement (writer.LookupPrefix (nspc), name, nspc); - } + { + switch ( mode) { + case XmlWriteMode.WriteSchema: + if (nspc == null || nspc == "") { + writer.WriteStartElement (name); + } + else if (prefix != null) { + writer.WriteStartElement (prefix, name, nspc); + } + else { + writer.WriteStartElement (writer.LookupPrefix (nspc), name, nspc); + } + break; + case XmlWriteMode.DiffGram: + if (nspc == null || nspc == "") { + writer.WriteStartElement (name); + } + else if (prefix != null) { + writer.WriteStartElement (prefix, name, nspc); + } + else { + writer.WriteStartElement (writer.LookupPrefix (nspc), name, nspc); + } + break; + default: + writer.WriteStartElement (name); + break; + }; } private void WriteAttributeString (XmlWriter writer, XmlWriteMode mode, string nspc, string prefix, string name, string stringValue) diff --git a/mcs/class/System.Data/System.Data/DataTable.cs b/mcs/class/System.Data/System.Data/DataTable.cs index 1e67b396db6..6b055031783 100644 --- a/mcs/class/System.Data/System.Data/DataTable.cs +++ b/mcs/class/System.Data/System.Data/DataTable.cs @@ -56,7 +56,7 @@ namespace System.Data { private string _encodedTableName;
internal bool _duringDataLoad;
private bool dataSetPrevEnforceConstraints;
- private DataRowBuilder _rowBuilder;
+
// If CaseSensitive property is changed once it does not anymore follow owner DataSet's
@@ -888,13 +888,7 @@ namespace System.Data { /// </summary>
public DataRow NewRow ()
{
- // initiate only one row builder.
- if (_rowBuilder == null)
- _rowBuilder = new DataRowBuilder (this, 0, 0);
-
- // new row get id -1.
- _rowBuilder._rowId = -1;
- return this.NewRowFromBuilder (_rowBuilder);
+ return this.NewRowFromBuilder (new DataRowBuilder (this, 0, 0));
}
/// <summary>
diff --git a/mcs/class/System.Drawing/System.Drawing.Imaging/BitmapData.cs b/mcs/class/System.Drawing/System.Drawing.Imaging/BitmapData.cs index 89d51b318bc..60b02717447 100755 --- a/mcs/class/System.Drawing/System.Drawing.Imaging/BitmapData.cs +++ b/mcs/class/System.Drawing/System.Drawing.Imaging/BitmapData.cs @@ -16,11 +16,10 @@ namespace System.Drawing.Imaging [StructLayout(LayoutKind.Sequential)]
public sealed class BitmapData {
internal int width, height, stride;
- internal PixelFormat pixel_format; + internal PixelFormat pixel_format;
internal IntPtr address;
internal int reserved;
private bool bAllocated = false;
- internal bool own_scan0;
~BitmapData()
{
diff --git a/mcs/class/System.Drawing/System.Drawing/FontFamily.cs b/mcs/class/System.Drawing/System.Drawing/FontFamily.cs index 289e957341f..f2e637a9112 100644 --- a/mcs/class/System.Drawing/System.Drawing/FontFamily.cs +++ b/mcs/class/System.Drawing/System.Drawing/FontFamily.cs @@ -9,8 +9,6 @@ // using System; using System.Drawing.Text; -using System.Text; -using System.Runtime.InteropServices; namespace System.Drawing { @@ -25,24 +23,15 @@ namespace System.Drawing { internal IntPtr nativeFontFamily = IntPtr.Zero; - internal FontFamily ( IntPtr fntfamily ) + internal FontFamily ( IntPtr ptr ) { - nativeFontFamily = fntfamily; - int language = 0; - - // Temporal until we fix bug 53700 - IntPtr dest = Marshal.AllocHGlobal (GDIPlus.FACESIZE * UnicodeEncoding.CharSize); - Status status = GDIPlus.GdipGetFamilyName (fntfamily, dest, language); - byte[] marshalled = new byte[GDIPlus.FACESIZE* UnicodeEncoding.CharSize]; - Marshal.Copy (dest, marshalled, 0, GDIPlus.FACESIZE* UnicodeEncoding.CharSize); - UnicodeEncoding enc = new UnicodeEncoding (false, true); - name = enc.GetString (marshalled); + nativeFontFamily = ptr; } //Need to come back here, is Arial the right thing to do internal FontFamily () : this ( "Arial", null ) { - + //FIXME } internal IntPtr NativeObject diff --git a/mcs/class/System.Drawing/System.Drawing/gdipFunctions.cs b/mcs/class/System.Drawing/System.Drawing/gdipFunctions.cs index 4fb40906f77..02243cd6ac2 100644 --- a/mcs/class/System.Drawing/System.Drawing/gdipFunctions.cs +++ b/mcs/class/System.Drawing/System.Drawing/gdipFunctions.cs @@ -20,8 +20,6 @@ namespace System.Drawing { /// </summary> public class GDIPlus { - public const int FACESIZE = 32; - #region gdiplus.dll functions // startup / shutdown @@ -732,9 +730,9 @@ namespace System.Drawing { internal static extern Status GdipCreateFontFamilyFromName ( [MarshalAs(UnmanagedType.LPWStr)] string fName, IntPtr collection, out IntPtr fontFamily); - // We should be using StringBuilder. See bug http://bugzilla.ximian.com/show_bug.cgi?id=53700 - [DllImport ("gdiplus.dll", CharSet=CharSet.Unicode)] - internal static extern Status GdipGetFamilyName(IntPtr family, IntPtr fName, int language); + /*[DllImport ("gdiplus.dll", CharSet=CharSet.Auto)] + internal static extern Status GdipGetFamilyName(IntPtr fontFamily, ); + GpStatus WINGDIPAPI GdipGetFamilyName( GDIPCONST GpFontFamily *family, WCHAR name[LF_FACESIZE], LANGID language )*/ [DllImport ("gdiplus.dll")] internal static extern Status GdipGetGenericFontFamilySansSerif (out IntPtr fontFamily); diff --git a/mcs/class/System.Drawing/Test/System.Drawing/font1.cs b/mcs/class/System.Drawing/Test/System.Drawing/font1.cs index 29dfbb765f2..f0c3231a3a9 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing/font1.cs +++ b/mcs/class/System.Drawing/Test/System.Drawing/font1.cs @@ -22,8 +22,7 @@ namespace Font1Sample { Console.WriteLine(ffm.Name); } - - Font f = new Font("Arial",12); + Font f = new Font(ifc.Families[0],12); Console.WriteLine("Height: {0}", f.Height); Bitmap bmp = new Bitmap((int)width, (int)height); diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog b/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog index aaf12cb2c5a..9c370bc6faa 100644 --- a/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog +++ b/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog @@ -1,10 +1,3 @@ -2004-02-01 Alon Gazit <along@mainsoft.com> - - * DataGrid.cs: fixed a problem in the paging mechanism in the method - InitializePager(). - the problem was when (PagerStyle.Mode == PagerMode.NumericPages), - while clicking the "..." link in the second page. - 2004-01-28 Alon Gazit <along@mainsoft.com> * Calendar.cs: prevent NullReferenceException in RenderAllDays(). diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DataGrid.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DataGrid.cs index 0c3b374fdb8..5e4e9902b89 100644 --- a/mcs/class/System.Web/System.Web.UI.WebControls/DataGrid.cs +++ b/mcs/class/System.Web/System.Web.UI.WebControls/DataGrid.cs @@ -1374,7 +1374,7 @@ namespace System.Web.UI.WebControls LinkButton toAddBtn = new DataGridLinkButton(); toAddBtn.Text = "..."; toAddBtn.CommandName = "Page"; - toAddBtn.CommandArgument = (firstPageNumber - 1).ToString(NumberFormatInfo.InvariantInfo); + toAddBtn.CommandArgument = (lastPageNumber - 1).ToString(NumberFormatInfo.InvariantInfo); toAddBtn.CausesValidation = false; toAdd.Controls.Add(toAddBtn); toAdd.Controls.Add(new LiteralControl(" ")); diff --git a/mcs/class/System.Web/System.Web.Util/ChangeLog b/mcs/class/System.Web/System.Web.Util/ChangeLog index 0f7b8d21b16..bffd59fcc5f 100644 --- a/mcs/class/System.Web/System.Web.Util/ChangeLog +++ b/mcs/class/System.Web/System.Web.Util/ChangeLog @@ -1,7 +1,3 @@ -2004-02-01 Alon Gazit <along@mainsoft.com>
-
- * UrlUtils.cs: little fix in GetDirectory ().
-
2004-01-11 Andreas Nahr <ClassDevelopment@A-SoftTech.com> * TransactedCallback.cs: diff --git a/mcs/class/System.Web/System.Web.Util/UrlUtils.cs b/mcs/class/System.Web/System.Web.Util/UrlUtils.cs index 18386eb9673..98e129c0987 100644 --- a/mcs/class/System.Web/System.Web.Util/UrlUtils.cs +++ b/mcs/class/System.Web/System.Web.Util/UrlUtils.cs @@ -276,7 +276,7 @@ namespace System.Web.Util {
return String.Empty;
}
- url = url.Replace('\\','/');
+ url.Replace('\\','/');
string baseDir = "";
int last = url.LastIndexOf ('/');
diff --git a/mcs/class/System/System.Text.RegularExpressions/ChangeLog b/mcs/class/System/System.Text.RegularExpressions/ChangeLog index a69009a5619..7baae4c93fd 100644 --- a/mcs/class/System/System.Text.RegularExpressions/ChangeLog +++ b/mcs/class/System/System.Text.RegularExpressions/ChangeLog @@ -1,9 +1,3 @@ -2004-02-01 Miguel de Icaza <miguel@ximian.com> - - * syntax.cs, interval.cs: Applied patch from Marco Cravairo - through Francois Beauchemin who reviewed on the mailing list. - This fixes bug #45976 - 2004-01-16 Gonzalo Paniagua Javier <gonzalo@ximian.com> * parser.cs: an opening brace without a diff --git a/mcs/class/System/System.Text.RegularExpressions/interval.cs b/mcs/class/System/System.Text.RegularExpressions/interval.cs index 6e337b8fb95..4c8d19f5b15 100644 --- a/mcs/class/System/System.Text.RegularExpressions/interval.cs +++ b/mcs/class/System/System.Text.RegularExpressions/interval.cs @@ -95,14 +95,6 @@ namespace System.Text.RegularExpressions { return low <= i && i <= high;
}
- public bool Intersects (Interval i) {
- if (IsEmpty || i.IsEmpty)
- return false;
-
- return ((Contains (i.low) && !Contains (i.high)) ||
- (Contains (i.high) && !Contains (i.low)));
- }
-
public void Merge (Interval i) {
if (i.IsEmpty)
return;
diff --git a/mcs/class/System/System.Text.RegularExpressions/syntax.cs b/mcs/class/System/System.Text.RegularExpressions/syntax.cs index e503f3edcd8..f0d0bc4ef78 100644 --- a/mcs/class/System/System.Text.RegularExpressions/syntax.cs +++ b/mcs/class/System/System.Text.RegularExpressions/syntax.cs @@ -779,39 +779,11 @@ namespace System.Text.RegularExpressions.Syntax { }
public void AddCharacter (char c) {
- // TODO: this is certainly not the most efficient way of doing things
- // TODO: but at least it produces correct results.
- AddRange (c, c);
+ intervals.Add (new Interval (c, c));
}
public void AddRange (char lo, char hi) {
- Interval new_interval = new Interval (lo, hi);
-
- // ignore case is on. we must make sure our interval does not
- // use upper case. if it does, we must normalize the upper case
- // characters into lower case.
- if (ignore) {
- if (upper_case_characters.Intersects (new_interval)) {
- Interval partial_new_interval;
-
- if (new_interval.low < upper_case_characters.low) {
- partial_new_interval = new Interval (upper_case_characters.low + distance_between_upper_and_lower_case,
- new_interval.high + distance_between_upper_and_lower_case);
- new_interval.high = upper_case_characters.low - 1;
- }
- else {
- partial_new_interval = new Interval (new_interval.low + distance_between_upper_and_lower_case,
- upper_case_characters.high + distance_between_upper_and_lower_case);
- new_interval.low = upper_case_characters.high + 1;
- }
- intervals.Add (partial_new_interval);
- }
- else if (upper_case_characters.Contains (new_interval)) {
- new_interval.high += distance_between_upper_and_lower_case;
- new_interval.low += distance_between_upper_and_lower_case;
- }
- }
- intervals.Add (new_interval);
+ intervals.Add (new Interval (lo, hi));
}
public override void Compile (ICompiler cmp, bool reverse) {
@@ -899,8 +871,6 @@ namespace System.Text.RegularExpressions.Syntax { return 3; // Range
}
- private static Interval upper_case_characters = new Interval ((char)65, (char)90);
- private const int distance_between_upper_and_lower_case = 32;
private bool negate, ignore;
private bool[] pos_cats, neg_cats;
private IntervalCollection intervals;
diff --git a/mcs/class/System/Test/System.Text.RegularExpressions/ChangeLog b/mcs/class/System/Test/System.Text.RegularExpressions/ChangeLog index e6f253b6446..6cbea91b46a 100644 --- a/mcs/class/System/Test/System.Text.RegularExpressions/ChangeLog +++ b/mcs/class/System/Test/System.Text.RegularExpressions/ChangeLog @@ -1,7 +1,3 @@ -2004-02-02 Nick Drochak <ndrochak@ieee.org> - - * RegexBugs.cs (RangeIgnoreCase): made the last assert pass on .NET. - 2004-01-16 Gonzalo Paniagua Javier <gonzalo@ximian.com> * RegexBugs.cs: added test from bug #52924. diff --git a/mcs/class/System/Test/System.Text.RegularExpressions/RegexBugs.cs b/mcs/class/System/Test/System.Text.RegularExpressions/RegexBugs.cs index 8931197434d..79b5b86936b 100644 --- a/mcs/class/System/Test/System.Text.RegularExpressions/RegexBugs.cs +++ b/mcs/class/System/Test/System.Text.RegularExpressions/RegexBugs.cs @@ -79,30 +79,5 @@ namespace MonoTests.System.Text.RegularExpressions Match m = regVar.Match ("{ }"); AssertEquals ("BR #01", false, m.Success); } - - [Test] - public void RangeIgnoreCase() // bug 45976 - { - string str = "AAABBBBAAA" ; - AssertEquals("RIC #01", true, Regex.IsMatch(str, @"[A-F]+", RegexOptions.IgnoreCase)); - AssertEquals("RIC #02", true, Regex.IsMatch(str, @"[a-f]+", RegexOptions.IgnoreCase)); - AssertEquals("RIC #03", true, Regex.IsMatch(str, @"[A-Fa-f]+", RegexOptions.IgnoreCase)); - AssertEquals("RIC #04", true, Regex.IsMatch(str, @"[AB]+", RegexOptions.IgnoreCase)); - AssertEquals("RIC #05", true, Regex.IsMatch(str, @"[A-B]+", RegexOptions.IgnoreCase)); - - str = "AaaBBBaAa" ; - AssertEquals("RIC #06", true, Regex.IsMatch(str, @"[A-F]+", RegexOptions.IgnoreCase)); - AssertEquals("RIC #07", true, Regex.IsMatch(str, @"[a-f]+", RegexOptions.IgnoreCase)); - AssertEquals("RIC #08", true, Regex.IsMatch(str, @"[A-Fa-f]+", RegexOptions.IgnoreCase)); - AssertEquals("RIC #09", true, Regex.IsMatch(str, @"[AB]+", RegexOptions.IgnoreCase)); - AssertEquals("RIC #10", true, Regex.IsMatch(str, @"[A-B]+", RegexOptions.IgnoreCase)); - - str = "Aaa["; - AssertEquals("RIC #11", true, Regex.IsMatch(str, @"[A-a]+", RegexOptions.IgnoreCase)); - - str = "Ae"; - Assert("RIC #12", Regex.IsMatch(str, @"[A-a]+", RegexOptions.IgnoreCase)); - - } } } diff --git a/mcs/class/corlib/System.Reflection.Emit/ChangeLog b/mcs/class/corlib/System.Reflection.Emit/ChangeLog index 4669f4122c4..fe84550bbb4 100644 --- a/mcs/class/corlib/System.Reflection.Emit/ChangeLog +++ b/mcs/class/corlib/System.Reflection.Emit/ChangeLog @@ -1,8 +1,3 @@ -2004-02-02 Zoltan Varga <vargaz@freemail.hu> - - * TypeBuilder.cs: Implement DefineUninitializedData and - AddDeclarativeSecurity. - 2004-01-27 Zoltan Varga <vargaz@freemail.hu> * AssemblyBuilder.cs (SetCustomAttribute): Move the reading of the diff --git a/mcs/class/corlib/System.Reflection.Emit/TypeBuilder.cs b/mcs/class/corlib/System.Reflection.Emit/TypeBuilder.cs index eb452053b39..73f358a322b 100644 --- a/mcs/class/corlib/System.Reflection.Emit/TypeBuilder.cs +++ b/mcs/class/corlib/System.Reflection.Emit/TypeBuilder.cs @@ -21,7 +21,6 @@ using System.Security.Permissions; namespace System.Reflection.Emit { public sealed class TypeBuilder : Type { - #region Sync with reflection.h private string tname; private string nspace; private Type parent; @@ -42,8 +41,6 @@ namespace System.Reflection.Emit { private int class_size; private PackingSize packing_size; private MonoGenericParam[] generic_params; - private RefEmitPermissionSet[] permissions; - #endregion private Type created; string fullname; @@ -182,32 +179,9 @@ namespace System.Reflection.Emit { } public override Type ReflectedType {get {return nesting_type;}} + [MonoTODO] public void AddDeclarativeSecurity( SecurityAction action, PermissionSet pset) { - if (pset == null) - throw new ArgumentNullException ("pset"); - if ((action == SecurityAction.RequestMinimum) || - (action == SecurityAction.RequestOptional) || - (action == SecurityAction.RequestRefuse)) - throw new ArgumentException ("Request* values are not permitted", "action"); - - if (is_created) - throw not_after_created (); - - if (permissions != null) { - /* Check duplicate actions */ - foreach (RefEmitPermissionSet set in permissions) - if (set.action == action) - throw new InvalidOperationException ("Multiple permission sets specified with the same SecurityAction."); - - RefEmitPermissionSet[] new_array = new RefEmitPermissionSet [permissions.Length + 1]; - permissions.CopyTo (new_array, 0); - permissions = new_array; - } - else - permissions = new RefEmitPermissionSet [1]; - - permissions [permissions.Length - 1] = new RefEmitPermissionSet (action, pset.ToXml ().ToString ()); - attrs |= TypeAttributes.HasSecurity; + throw new NotImplementedException (); } public void AddInterfaceImplementation( Type interfaceType) { @@ -1056,34 +1030,37 @@ namespace System.Reflection.Emit { return res; } + static int InitializedDataCount = 0; + public FieldBuilder DefineInitializedData( string name, byte[] data, FieldAttributes attributes) { + check_name ("name", name); if (data == null) throw new ArgumentNullException ("data"); if ((data.Length == 0) || (data.Length > 0x3f0000)) throw new ArgumentException ("data", "Data size must be > 0 and < 0x3f0000"); + if (is_created) + throw not_after_created (); - FieldBuilder res = DefineUninitializedData (name, data.Length, attributes); + string s = "$ArrayType$"+InitializedDataCount.ToString(); + TypeBuilder datablobtype = DefineNestedType (s, + TypeAttributes.NestedPrivate|TypeAttributes.ExplicitLayout|TypeAttributes.Sealed, + pmodule.assemblyb.corlib_value_type, null, PackingSize.Size1, data.Length); + datablobtype.CreateType (); + FieldBuilder res = DefineField (name, datablobtype, attributes|FieldAttributes.Assembly|FieldAttributes.Static|FieldAttributes.HasFieldRVA); res.SetRVAData (data); - + InitializedDataCount++; return res; } - static int UnmanagedDataCount = 0; - + [MonoTODO] public FieldBuilder DefineUninitializedData( string name, int size, FieldAttributes attributes) { check_name ("name", name); if ((size <= 0) || (size > 0x3f0000)) - throw new ArgumentException ("size", "Data size must be > 0 and < 0x3f0000"); + throw new ArgumentException ("data", "Data size must be > 0 and < 0x3f0000"); if (is_created) throw not_after_created (); - string s = "$ArrayType$"+UnmanagedDataCount.ToString(); - UnmanagedDataCount++; - TypeBuilder datablobtype = DefineNestedType (s, - TypeAttributes.NestedPrivate|TypeAttributes.ExplicitLayout|TypeAttributes.Sealed, - pmodule.assemblyb.corlib_value_type, null, PackingSize.Size1, size); - datablobtype.CreateType (); - return DefineField (name, datablobtype, attributes|FieldAttributes.Static|FieldAttributes.HasFieldRVA); + throw new NotImplementedException (); } public TypeToken TypeToken { diff --git a/mcs/class/corlib/System/ChangeLog b/mcs/class/corlib/System/ChangeLog index e0d348751aa..325beb47b4e 100644 --- a/mcs/class/corlib/System/ChangeLog +++ b/mcs/class/corlib/System/ChangeLog @@ -1,12 +1,3 @@ -2004-02-02 Zoltan Varga <vargaz@freemail.hu> - - * Environment.cs: Bump corlib version. - -2004-02-02 Sebastien Pouliot <sebastien@ximian.ca> - - * DateTime.cs: Corrected support for "Z" in the mask (Parse). This - fix bug #53461. - 2004-01-27 Sebastien Pouliot <spouliot@videotron.ca> * Exception.cs: Changed ToString to remove the \n when no stack trace diff --git a/mcs/class/corlib/System/DateTime.cs b/mcs/class/corlib/System/DateTime.cs index de855909d7d..b7f8e5a69c0 100644 --- a/mcs/class/corlib/System/DateTime.cs +++ b/mcs/class/corlib/System/DateTime.cs @@ -883,9 +883,6 @@ namespace System num = 2;
}
break;
- case 'Z': - useutc = true; - break; case ':':
if (!_ParseString (s, 0, dfi.TimeSeparator, out num_parsed))
return false;
diff --git a/mcs/class/corlib/System/Environment.cs b/mcs/class/corlib/System/Environment.cs index 8b5d74a1fe6..64958b7addf 100644 --- a/mcs/class/corlib/System/Environment.cs +++ b/mcs/class/corlib/System/Environment.cs @@ -29,7 +29,7 @@ namespace System * increment this variable. Also increment the * pair of this variable in the runtime in metadata/appdomain.c. */ - private const int mono_corlib_version = 11; + private const int mono_corlib_version = 10; private Environment () {} diff --git a/mcs/class/corlib/Test/System.Collections/HashtableTest.cs b/mcs/class/corlib/Test/System.Collections/HashtableTest.cs index ca9cf29fb91..54b50420fe6 100644 --- a/mcs/class/corlib/Test/System.Collections/HashtableTest.cs +++ b/mcs/class/corlib/Test/System.Collections/HashtableTest.cs @@ -35,7 +35,7 @@ public class HashtableTest : Assertion { {
bool errorThrown = false;
try {
- Hashtable h = new Hashtable((IDictionary) null);
+ Hashtable h = new Hashtable(null);
} catch (ArgumentNullException) {
errorThrown = true;
}
diff --git a/mcs/tests/gen-test.pl b/mcs/tests/gen-test.pl index 1d6e6f0cb47..750b73d9fef 100755 --- a/mcs/tests/gen-test.pl +++ b/mcs/tests/gen-test.pl @@ -57,15 +57,10 @@ sub LibraryTest RunTest (0, $mono, $exe) or return 0; } -my @verify; -push @verify, "sidney"; -push @verify, 'bin/peverify.sh'; - foreach my $file (@normal) { print "RUNNING TEST: $file\n"; if (NormalTest ($file)) { print STDERR "TEST SUCCEEDED: $file\n"; - push @verify, qq[$file.exe]; } else { print STDERR "TEST FAILED: $file\n"; } @@ -75,17 +70,7 @@ foreach my $file (@library) { print "RUNNING LIBRARY TEST: $file\n"; if (LibraryTest ($file)) { print STDERR "TEST SUCCEEDED: $file\n"; - push @verify, qq[$file-dll.dll]; - push @verify, qq[$file-exe.exe]; } else { print STDERR "TEST FAILED: $file\n"; } } - -my $hostname = `hostname --fqdn`; -chop $hostname; - -if ($hostname eq 'gondor.martin.baulig') { - print STDERR "VERIFYING TESTS\n"; - RunTest (0, "ssh", @verify); -} diff --git a/mono/arch/ChangeLog b/mono/arch/ChangeLog index 3343afa8b8e..1dadd04cbd0 100644 --- a/mono/arch/ChangeLog +++ b/mono/arch/ChangeLog @@ -1,7 +1,3 @@ -2004-02-02 Zoltan Varga <vargaz@freemail.hu> - - * sparc/tramp.c: Implement all floating point argument passing conventions in - Sparc V8. Also fix structure passing in V8. Thu Nov 13 16:24:29 CET 2003 Paolo Molaro <lupus@ximian.com> diff --git a/mono/arch/sparc/tramp.c b/mono/arch/sparc/tramp.c index 3b8a42df714..0bf55c1cd84 100644 --- a/mono/arch/sparc/tramp.c +++ b/mono/arch/sparc/tramp.c @@ -166,9 +166,6 @@ calculate_sizes (MonoMethodSignature *sig, guint *stack_size, guint *code_size, case MONO_TYPE_R4: #if SPARCV9 (*code_size) += 4; /* for the fdtos */ -#else - (*code_size) += 12; - (*stack_size) += 4; #endif case MONO_TYPE_BOOLEAN: case MONO_TYPE_CHAR: @@ -194,11 +191,7 @@ calculate_sizes (MonoMethodSignature *sig, guint *stack_size, guint *code_size, goto enum_calc_size; } size = mono_class_native_size (sig->params[i]->data.klass, NULL); -#if SPARCV9 if (size != 4) { -#else - if (1) { -#endif DEBUG(fprintf(stderr, "copy %d byte struct on stack\n", size)); *use_memcpy = TRUE; *code_size += 8*4; @@ -415,11 +408,7 @@ emit_save_parameters (guint32 *p, MonoMethodSignature *sig, guint stack_size, gint size; size = mono_class_native_size (sig->params[i]->data.klass, NULL); -#if SPARCV9 if (size != 4) { -#else - if (1) { -#endif /* need to call memcpy here */ sparc_add_imm (p, 0, sparc_sp, stack_par_pos, sparc_o0); sparc_ld_imm_ptr (p, sparc_i3, i*16, sparc_o1); @@ -469,44 +458,25 @@ emit_save_parameters (guint32 *p, MonoMethodSignature *sig, guint stack_size, case MONO_TYPE_CHAR: case MONO_TYPE_I4: case MONO_TYPE_U4: - if (gr < OUT_REGS) { - sparc_ld_imm (p, ARG_BASE, i*ARG_SIZE, sparc_o0 + gr); - gr++; - } else { - sparc_ld_imm (p, ARG_BASE, i*ARG_SIZE, sparc_l0); - sparc_st_imm_word (p, sparc_l0, sparc_sp, stack_par_pos); - stack_par_pos += SLOT_SIZE; - } - break; - +#if !SPARCV9 case MONO_TYPE_R4: -#if SPARCV9 - sparc_lddf_imm (p, ARG_BASE, i*ARG_SIZE, sparc_f30); /* fix using this fixed reg */ - sparc_fdtos(p, sparc_f30, sparc_f0 + 2 * gr + 1); - gr++; - break; -#else - /* Convert from double to single */ - sparc_lddf_imm (p, ARG_BASE, i*ARG_SIZE, sparc_f0); - sparc_fdtos (p, sparc_f0, sparc_f0); - - /* - * FIXME: Is there an easier way to do an - * freg->ireg move ? - */ - sparc_stf_imm (p, sparc_f0, sparc_sp, stack_par_pos); - +#endif if (gr < OUT_REGS) { - sparc_ld_imm (p, sparc_sp, stack_par_pos, sparc_o0 + gr); + sparc_ld_imm (p, ARG_BASE, i*ARG_SIZE, sparc_o0 + gr); gr++; } else { - sparc_ldf_imm (p, sparc_sp, stack_par_pos, sparc_f0); - sparc_stf_imm (p, sparc_f0, sparc_sp, stack_par_pos); + sparc_ld_imm (p, ARG_BASE, i*ARG_SIZE, sparc_l0); + sparc_st_imm_word (p, sparc_l0, sparc_sp, stack_par_pos); stack_par_pos += SLOT_SIZE; } break; +#if SPARCV9 + case MONO_TYPE_R4: + sparc_lddf_imm (p, ARG_BASE, i*ARG_SIZE, sparc_f30); /* fix using this fixed reg */ + sparc_fdtos(p, sparc_f30, sparc_f0 + 2 * gr + 1); + gr++; + break; #endif - case MONO_TYPE_I: case MONO_TYPE_U: case MONO_TYPE_PTR: @@ -534,15 +504,7 @@ emit_save_parameters (guint32 *p, MonoMethodSignature *sig, guint stack_size, sparc_st_imm_word (p, sparc_l0, sparc_sp, stack_par_pos); stack_par_pos += SLOT_SIZE; } - break; - } #else - /* - * FIXME: The 32bit ABI docs do not mention that small - * structures are passed in registers. - */ - - /* if (size == 4) { if (gr < OUT_REGS) { sparc_ld_imm_ptr (p, ARG_BASE, i*ARG_SIZE, sparc_l0); @@ -554,24 +516,22 @@ emit_save_parameters (guint32 *p, MonoMethodSignature *sig, guint stack_size, sparc_st_imm_word (p, sparc_l0, sparc_sp, stack_par_pos); stack_par_pos += SLOT_SIZE; } - break; - } - */ #endif - - if (gr < OUT_REGS) { - sparc_add_imm (p, 0, sparc_sp, - cur_struct_pos, sparc_o0 + gr); - gr ++; } else { - sparc_ld_imm_ptr (p, sparc_sp, - cur_struct_pos, - sparc_l1); - sparc_st_imm_ptr (p, sparc_l1, - sparc_sp, - stack_par_pos); + if (gr < OUT_REGS) { + sparc_add_imm (p, 0, sparc_sp, + cur_struct_pos, sparc_o0 + gr); + gr ++; + } else { + sparc_ld_imm_ptr (p, sparc_sp, + cur_struct_pos, + sparc_l1); + sparc_st_imm_ptr (p, sparc_l1, + sparc_sp, + stack_par_pos); + } + cur_struct_pos += (size + (SLOT_SIZE - 1)) & (~(SLOT_SIZE - 1)); } - cur_struct_pos += (size + (SLOT_SIZE - 1)) & (~(SLOT_SIZE - 1)); break; } @@ -592,30 +552,22 @@ emit_save_parameters (guint32 *p, MonoMethodSignature *sig, guint stack_size, #else case MONO_TYPE_I8: case MONO_TYPE_R8: - if (gr < (OUT_REGS - 1)) { + /* this will break in subtle ways... */ + if (gr < 5) { sparc_ld_imm (p, ARG_BASE, i*ARG_SIZE, sparc_o0 + gr); gr ++; - sparc_ld_imm (p, ARG_BASE, - (i*ARG_SIZE) + 4, - sparc_o0 + gr); - gr ++; - } else if (gr == (OUT_REGS - 1)) { - /* Split register/stack */ - sparc_ld_imm (p, ARG_BASE, i*ARG_SIZE, sparc_o0 + gr); + if (gr >= OUT_REGS) { + NOT_IMPL("split reg/stack") + break; + } else { + sparc_ld_imm (p, ARG_BASE, + (i*ARG_SIZE) + 4, + sparc_o0 + gr); + } gr ++; - - sparc_ld_imm (p, ARG_BASE, (i*ARG_SIZE) + 4, sparc_l0); - sparc_st_imm (p, sparc_l0, sparc_sp, stack_par_pos); - stack_par_pos += SLOT_SIZE; } else { - sparc_ld_imm (p, ARG_BASE, i*ARG_SIZE, sparc_l0); - sparc_st_imm (p, sparc_l0, sparc_sp, stack_par_pos); - stack_par_pos += SLOT_SIZE; - - sparc_ld_imm (p, ARG_BASE, (i*ARG_SIZE) + 4, sparc_l0); - sparc_st_imm (p, sparc_l0, sparc_sp, stack_par_pos); - stack_par_pos += SLOT_SIZE; + NOT_IMPL("FIXME: I8/R8 on stack"); } break; #endif @@ -624,8 +576,6 @@ emit_save_parameters (guint32 *p, MonoMethodSignature *sig, guint stack_size, } } - g_assert ((stack_par_pos - BIAS) <= stack_size); - return p; } diff --git a/mono/interpreter/ChangeLog b/mono/interpreter/ChangeLog index 79f0cf272e2..1e5464eda5d 100644 --- a/mono/interpreter/ChangeLog +++ b/mono/interpreter/ChangeLog @@ -1,8 +1,3 @@ -2004-02-02 Zoltan Varga <vargaz@freemail.hu> - - * interp.c (ves_exec_method_with_context): Add new marshalling - conventions. - 2004-01-22 Zoltan Varga <vargaz@freemail.hu> * interp.c (mono_main): Remove call to mono_verify_corlib (), since diff --git a/mono/interpreter/interp.c b/mono/interpreter/interp.c index 6013a5894e4..baf7ac8325d 100644 --- a/mono/interpreter/interp.c +++ b/mono/interpreter/interp.c @@ -4153,12 +4153,8 @@ array_constructed: sp->data.p = mono_string_to_ansibstr (sp->data.p); break; case MONO_MARSHAL_CONV_SB_LPSTR: - case MONO_MARSHAL_CONV_SB_LPTSTR: sp->data.p = mono_string_builder_to_utf8 (sp->data.p); break; - case MONO_MARSHAL_CONV_SB_LPWSTR: - sp->data.p = mono_string_builder_to_utf16 (sp->data.p); - break; case MONO_MARSHAL_CONV_ARRAY_SAVEARRAY: sp->data.p = mono_array_to_savearray (sp->data.p); break; @@ -4191,12 +4187,8 @@ array_constructed: switch (conv) { case MONO_MARSHAL_CONV_LPSTR_SB: - case MONO_MARSHAL_CONV_LPTSTR_SB: mono_string_utf8_to_builder (sp [0].data.p, sp [1].data.p); break; - case MONO_MARSHAL_CONV_LPWSTR_SB: - mono_string_utf16_to_builder (sp [0].data.p, sp [1].data.p); - break; case MONO_MARSHAL_FREE_ARRAY: mono_marshal_free_array (sp [0].data.p, sp [1].data.i); break; diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog index 8f504fc1665..80e1f9b52f2 100644 --- a/mono/metadata/ChangeLog +++ b/mono/metadata/ChangeLog @@ -1,35 +1,3 @@ -2004-02-02 Zoltan Varga <vargaz@freemail.hu> - - * gc.c threads.c: Make the finalizer thread a normal managed thread so - the finalizer code can use thread functionality. - - * gc.c (ves_icall_System_GC_WaitForPendingFinalizers): Fix check for - the finalizer thread. - - * threads.c: Make some functions more robust. - - * loader.c (mono_lookup_pinvoke_call): Another attempt at fixing #22532. - - * metadata.h: Add new marshalling conventions. - - * marshal.c (mono_marshal_get_native_wrapper): Add support for unicode - stringbuilder marshalling. Fixes #53700. - - * reflection.h (MonoReflectionTypeBuilder): Add 'permissions' field. - - * reflection.c (mono_image_get_type_info): Save declarative security - info. - - * reflection.c (mono_image_get_field_info): Handle uninitialized - unmanaged fields as well. - - * appdomain.c: Bump corlib version. - -2004-02-01 Martin Baulig <martin@ximian.com> - - * loader.c (method_from_methodspec): Use `ginst->mtype_argc/v' for - method type arguments. - 2004-01-30 Duncan Mak <duncan@ximian.com> * marshal.h: Add prototype for diff --git a/mono/metadata/appdomain.c b/mono/metadata/appdomain.c index eaf74765733..4df5e91c14b 100644 --- a/mono/metadata/appdomain.c +++ b/mono/metadata/appdomain.c @@ -26,7 +26,7 @@ #include <mono/metadata/marshal.h> #include <mono/utils/mono-uri.h> -#define MONO_CORLIB_VERSION 11 +#define MONO_CORLIB_VERSION 10 CRITICAL_SECTION mono_delegate_section; diff --git a/mono/metadata/gc-internal.h b/mono/metadata/gc-internal.h index b753dc84493..15077461608 100644 --- a/mono/metadata/gc-internal.h +++ b/mono/metadata/gc-internal.h @@ -27,7 +27,6 @@ gpointer ves_icall_System_GCHandle_GetAddrOfPinnedObject (guint32 handle); extern void mono_gc_init (void); extern void mono_gc_cleanup (void); -extern gboolean mono_gc_is_finalizer_thread (MonoThread *thread); #endif /* __MONO_METADATA_GC_H__ */ diff --git a/mono/metadata/gc.c b/mono/metadata/gc.c index b548bfa3106..6815f0027d9 100644 --- a/mono/metadata/gc.c +++ b/mono/metadata/gc.c @@ -42,7 +42,7 @@ static CRITICAL_SECTION finalizer_mutex; static GSList *domains_to_finalize= NULL; -static MonoThread *gc_thread; +static HANDLE gc_thread; static void object_register_finalizer (MonoObject *obj, void (*callback)(void *, void*)); @@ -50,7 +50,6 @@ static void object_register_finalizer (MonoObject *obj, void (*callback)(void *, static void finalize_notify (void); static HANDLE pending_done_event; static HANDLE shutdown_event; -static HANDLE thread_started_event; #endif /* @@ -261,7 +260,7 @@ ves_icall_System_GC_WaitForPendingFinalizers (void) if (!GC_should_invoke_finalizers ()) return; - if (mono_thread_current () == gc_thread) + if (GetCurrentThread () == gc_thread) /* Avoid deadlocks */ return; @@ -512,10 +511,8 @@ static guint32 finalizer_thread (gpointer unused) { guint32 stack_start; - gc_thread = mono_thread_current (); - - SetEvent (thread_started_event); - + mono_thread_new_init (GetCurrentThreadId (), &stack_start, NULL); + while(!finished) { /* Wait to be notified that there's at least one * finaliser to run @@ -616,20 +613,21 @@ void mono_gc_init (void) finalizer_event = CreateEvent (NULL, FALSE, FALSE, NULL); pending_done_event = CreateEvent (NULL, TRUE, FALSE, NULL); shutdown_event = CreateEvent (NULL, TRUE, FALSE, NULL); - thread_started_event = CreateEvent (NULL, TRUE, FALSE, NULL); - if (finalizer_event == NULL || pending_done_event == NULL || shutdown_event == NULL || thread_started_event == NULL) { + if (finalizer_event == NULL || pending_done_event == NULL || shutdown_event == NULL) { g_assert_not_reached (); } GC_finalize_on_demand = 1; GC_finalizer_notifier = finalize_notify; - - mono_thread_create (mono_domain_get (), finalizer_thread, NULL); - /* - * Wait until the finalizer thread sets gc_thread since its value is needed - * by mono_thread_attach () + + /* Don't use mono_thread_create here, because we don't want + * the runtime to wait for this thread to exit when it's + * cleaning up. */ - WaitForSingleObject (thread_started_event, INFINITE); + gc_thread = CreateThread (NULL, mono_threads_get_default_stacksize (), finalizer_thread, NULL, 0, NULL); + if (gc_thread == NULL) { + g_assert_not_reached (); + } #endif } @@ -670,10 +668,3 @@ void mono_gc_cleanup (void) #endif -gboolean -mono_gc_is_finalizer_thread (MonoThread *thread) -{ - return thread == gc_thread; -} - - diff --git a/mono/metadata/loader.c b/mono/metadata/loader.c index a2674323034..be4486d3437 100644 --- a/mono/metadata/loader.c +++ b/mono/metadata/loader.c @@ -507,14 +507,14 @@ method_from_methodspec (MonoImage *image, guint32 idx) ginst = g_new0 (MonoGenericInst, 1); ginst->generic_method = method; - ginst->mtype_argc = param_count; - ginst->mtype_argv = g_new0 (MonoType *, param_count); + ginst->type_argc = param_count; + ginst->type_argv = g_new0 (MonoType *, param_count); for (i = 0; i < param_count; i++) { - ginst->mtype_argv [i] = mono_metadata_parse_type (image, MONO_PARSE_TYPE, 0, ptr, &ptr); + ginst->type_argv [i] = mono_metadata_parse_type (image, MONO_PARSE_TYPE, 0, ptr, &ptr); if (!ginst->is_open) - ginst->is_open = mono_class_is_open_constructed_type (ginst->mtype_argv [i]); + ginst->is_open = mono_class_is_open_constructed_type (ginst->type_argv [i]); } return mono_class_inflate_generic_method (method, ginst); @@ -605,11 +605,11 @@ mono_lookup_pinvoke_call (MonoMethod *method, const char **exc_class, const char guint32 im_cols [MONO_IMPLMAP_SIZE]; guint32 scope_token; const char *import = NULL; + char *scope = NULL; const char *orig_scope; const char *new_scope; - char *full_name, *file_name; - int i; - GModule *gmodule = NULL; + char *full_name; + GModule *gmodule; g_assert (method->flags & METHOD_ATTRIBUTE_PINVOKE_IMPL); @@ -632,56 +632,40 @@ mono_lookup_pinvoke_call (MonoMethod *method, const char **exc_class, const char mono_dllmap_lookup (orig_scope, import, &new_scope, &import); - /* - * Try loading the module using a variety of names - */ - for (i = 0; i < 2; ++i) { - if (i == 0) - /* Try the original name */ - file_name = g_strdup (new_scope); - else { - /* Try trimming the .dll extension */ - if (strstr (new_scope, ".dll") == (new_scope + strlen (new_scope) - 4)) { - file_name = g_strdup (new_scope); - file_name [strlen (new_scope) - 4] = '\0'; - } - else - break; - } - - if (!gmodule) { - full_name = g_module_build_path (NULL, file_name); - gmodule = g_module_open (full_name, G_MODULE_BIND_LAZY); - g_free (full_name); - } - - if (!gmodule) { - full_name = g_module_build_path (".", file_name); - gmodule = g_module_open (full_name, G_MODULE_BIND_LAZY); - g_free (full_name); - } - - if (!gmodule) { - gmodule=g_module_open (file_name, G_MODULE_BIND_LAZY); - } + scope = g_strdup (new_scope); + + if (strstr (scope, ".dll") == (scope + strlen (scope) - 4)) { + // FIXME: This won't work for libraries named lib<FOO>.dll.so + //scope [strlen (scope) - 4] = '\0'; + } - g_free (file_name); + full_name = g_module_build_path (NULL, scope); + gmodule = g_module_open (full_name, G_MODULE_BIND_LAZY); - if (gmodule) - break; + if (!gmodule) { + g_free (full_name); + full_name = g_module_build_path (".", scope); + gmodule = g_module_open (full_name, G_MODULE_BIND_LAZY); } if (!gmodule) { gchar *error = g_strdup (g_module_error ()); - - if (exc_class) { - *exc_class = "DllNotFoundException"; - *exc_arg = orig_scope; + if (!(gmodule=g_module_open (scope, G_MODULE_BIND_LAZY))) { + if (exc_class) { + *exc_class = "DllNotFoundException"; + *exc_arg = orig_scope; + } + g_free (error); + g_free (full_name); + g_free (scope); + return NULL; } g_free (error); - return NULL; } + g_free (full_name); + g_free (scope); + if (piinfo->piflags & PINVOKE_ATTRIBUTE_NO_MANGLE) { g_module_symbol (gmodule, import, &method->addr); } else { diff --git a/mono/metadata/marshal.c b/mono/metadata/marshal.c index f4e30cf1bfc..02a63653756 100644 --- a/mono/metadata/marshal.c +++ b/mono/metadata/marshal.c @@ -180,23 +180,6 @@ mono_string_utf8_to_builder (MonoStringBuilder *sb, char *text) g_free (ut); } -void -mono_string_utf16_to_builder (MonoStringBuilder *sb, gunichar2 *text) -{ - const gunichar2 *s; - guint32 len; - - if (!sb || !text) - return; - - g_assert (mono_string_chars (sb->str) == text); - - for (len = 0; text [len] != 0; ++len) - ; - - sb->length = len; -} - gpointer mono_string_builder_to_utf8 (MonoStringBuilder *sb) { @@ -218,15 +201,6 @@ mono_string_builder_to_utf8 (MonoStringBuilder *sb) } gpointer -mono_string_builder_to_utf16 (MonoStringBuilder *sb) -{ - if (!sb) - return NULL; - - return mono_string_chars (sb->str); -} - -gpointer mono_string_to_ansibstr (MonoString *string_obj) { g_error ("implement me"); @@ -3148,40 +3122,7 @@ mono_marshal_get_native_wrapper (MonoMethod *method) mono_mb_emit_ldarg (mb, argnum); mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX); mono_mb_emit_byte (mb, CEE_MONO_FUNC1); - - if (spec) { - switch (spec->native) { - case MONO_NATIVE_LPWSTR: - mono_mb_emit_byte (mb, MONO_MARSHAL_CONV_SB_LPWSTR); - break; - case MONO_NATIVE_LPSTR: - mono_mb_emit_byte (mb, MONO_MARSHAL_CONV_SB_LPSTR); - break; - default: { - char *msg = g_strdup_printf ("stringbuilder marshalling conversion %d not implemented", spec->native); - MonoException *exc = mono_get_exception_not_implemented (msg); - g_warning (msg); - g_free (msg); - mono_raise_exception (exc); - } - } - } else { - switch (piinfo->piflags & PINVOKE_ATTRIBUTE_CHAR_SET_MASK) { - case PINVOKE_ATTRIBUTE_CHAR_SET_ANSI: - mono_mb_emit_byte (mb, MONO_MARSHAL_CONV_SB_LPSTR); - break; - case PINVOKE_ATTRIBUTE_CHAR_SET_UNICODE: - mono_mb_emit_byte (mb, MONO_MARSHAL_CONV_SB_LPWSTR); - break; - case PINVOKE_ATTRIBUTE_CHAR_SET_AUTO: - mono_mb_emit_byte (mb, MONO_MARSHAL_CONV_SB_LPTSTR); - break; - default: - mono_mb_emit_byte (mb, MONO_MARSHAL_CONV_SB_LPSTR); - break; - } - } - + mono_mb_emit_byte (mb, MONO_MARSHAL_CONV_SB_LPSTR); mono_mb_emit_stloc (mb, tmp_locals [i]); } else { mono_mb_emit_byte (mb, CEE_LDNULL); @@ -3636,7 +3577,6 @@ mono_marshal_get_native_wrapper (MonoMethod *method) /* we need to convert byref arguments back and free string arrays */ for (i = 0; i < sig->param_count; i++) { MonoType *t = sig->params [i]; - MonoMarshalSpec *spec = mspecs [i + 1]; argnum = i + sig->hasthis; @@ -3663,35 +3603,7 @@ mono_marshal_get_native_wrapper (MonoMethod *method) mono_mb_emit_ldloc (mb, tmp_locals [i]); mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX); mono_mb_emit_byte (mb, CEE_MONO_PROC2); - - if (spec) { - switch (spec->native) { - case MONO_NATIVE_LPWSTR: - mono_mb_emit_byte (mb, MONO_MARSHAL_CONV_LPWSTR_SB); - break; - case MONO_NATIVE_LPSTR: - mono_mb_emit_byte (mb, MONO_MARSHAL_CONV_LPSTR_SB); - break; - default: - g_assert_not_reached (); - } - } else { - switch (piinfo->piflags & PINVOKE_ATTRIBUTE_CHAR_SET_MASK) { - case PINVOKE_ATTRIBUTE_CHAR_SET_ANSI: - mono_mb_emit_byte (mb, MONO_MARSHAL_CONV_LPSTR_SB); - break; - case PINVOKE_ATTRIBUTE_CHAR_SET_UNICODE: - mono_mb_emit_byte (mb, MONO_MARSHAL_CONV_LPWSTR_SB); - break; - case PINVOKE_ATTRIBUTE_CHAR_SET_AUTO: - mono_mb_emit_byte (mb, MONO_MARSHAL_CONV_LPTSTR_SB); - break; - default: - mono_mb_emit_byte (mb, MONO_MARSHAL_CONV_LPSTR_SB); - break; - } - } - + mono_mb_emit_byte (mb, MONO_MARSHAL_CONV_LPSTR_SB); mono_mb_emit_ldloc (mb, tmp_locals [i]); mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX); mono_mb_emit_byte (mb, CEE_MONO_FREE); diff --git a/mono/metadata/marshal.h b/mono/metadata/marshal.h index 9aacd38cdac..5b0067a78d9 100644 --- a/mono/metadata/marshal.h +++ b/mono/metadata/marshal.h @@ -46,16 +46,10 @@ mono_array_to_lparray (MonoArray *array); void mono_string_utf8_to_builder (MonoStringBuilder *sb, char *text); -void -mono_string_utf16_to_builder (MonoStringBuilder *sb, gunichar2 *text); - gpointer mono_string_builder_to_utf8 (MonoStringBuilder *sb); gpointer -mono_string_builder_to_utf16 (MonoStringBuilder *sb); - -gpointer mono_string_to_ansibstr (MonoString *string_obj); gpointer diff --git a/mono/metadata/metadata.h b/mono/metadata/metadata.h index 238295ad29a..8f252d2111b 100644 --- a/mono/metadata/metadata.h +++ b/mono/metadata/metadata.h @@ -143,11 +143,7 @@ typedef enum { MONO_MARSHAL_CONV_STR_BYVALSTR, MONO_MARSHAL_CONV_STR_BYVALWSTR, MONO_MARSHAL_CONV_SB_LPSTR, - MONO_MARSHAL_CONV_SB_LPTSTR, - MONO_MARSHAL_CONV_SB_LPWSTR, MONO_MARSHAL_CONV_LPSTR_SB, - MONO_MARSHAL_CONV_LPTSTR_SB, - MONO_MARSHAL_CONV_LPWSTR_SB, MONO_MARSHAL_CONV_ARRAY_BYVALARRAY, MONO_MARSHAL_CONV_ARRAY_SAVEARRAY, MONO_MARSHAL_CONV_ARRAY_LPARRAY, diff --git a/mono/metadata/reflection.c b/mono/metadata/reflection.c index 457b22262c7..ad4de0cafdd 100644 --- a/mono/metadata/reflection.c +++ b/mono/metadata/reflection.c @@ -1,3 +1,4 @@ + /* * reflection.c: Routines for creating an image at runtime. * @@ -1549,7 +1550,7 @@ mono_image_get_field_info (MonoReflectionFieldBuilder *fb, MonoDynamicImage *ass values [MONO_CONSTANT_TYPE] = field_type; values [MONO_CONSTANT_PADDING] = 0; } - if (fb->attrs & FIELD_ATTRIBUTE_HAS_FIELD_RVA) { + if (fb->rva_data) { guint32 rva_idx; table = &assembly->tables [MONO_TABLE_FIELDRVA]; table->rows ++; @@ -1559,10 +1560,7 @@ mono_image_get_field_info (MonoReflectionFieldBuilder *fb, MonoDynamicImage *ass /* * We store it in the code section because it's simpler for now. */ - if (fb->rva_data) - rva_idx = mono_image_add_stream_data (&assembly->code, mono_array_addr (fb->rva_data, char, 0), mono_array_length (fb->rva_data)); - else - rva_idx = mono_image_add_stream_zero (&assembly->code, mono_class_value_size (fb->handle->parent, NULL)); + rva_idx = mono_image_add_stream_data (&assembly->code, mono_array_addr (fb->rva_data, char, 0), mono_array_length (fb->rva_data)); values [MONO_FIELD_RVA_RVA] = rva_idx + assembly->text_rva; } if (fb->marshal_info) { @@ -2595,11 +2593,6 @@ mono_image_get_type_info (MonoDomain *domain, MonoReflectionTypeBuilder *tb, Mon mono_image_get_property_info ( mono_array_get (tb->properties, MonoReflectionPropertyBuilder*, i), assembly); } - - mono_image_add_decl_security (assembly, - mono_metadata_make_token (MONO_TABLE_TYPEDEF, tb->table_idx), - tb->permissions); - if (tb->subtypes) { MonoDynamicTable *ntable; diff --git a/mono/metadata/reflection.h b/mono/metadata/reflection.h index d236ad75fe5..7af4beec0da 100644 --- a/mono/metadata/reflection.h +++ b/mono/metadata/reflection.h @@ -432,7 +432,6 @@ typedef struct { gint32 class_size; gint32 packing_size; MonoArray *generic_params; - MonoArray *permissions; } MonoReflectionTypeBuilder; typedef struct { diff --git a/mono/metadata/threads.c b/mono/metadata/threads.c index 8969d59eccc..3a1737ecb0f 100644 --- a/mono/metadata/threads.c +++ b/mono/metadata/threads.c @@ -22,7 +22,6 @@ #include <mono/metadata/exception.h> #include <mono/metadata/environment.h> #include <mono/metadata/monitor.h> -#include <mono/metadata/gc-internal.h> #include <mono/io-layer/io-layer.h> #include <mono/os/gc_wrapper.h> @@ -127,8 +126,7 @@ static void handle_remove(guint32 tid) EnterCriticalSection(&threads_mutex); - if (threads) - mono_g_hash_table_remove (threads, GUINT_TO_POINTER(tid)); + mono_g_hash_table_remove (threads, GUINT_TO_POINTER(tid)); LeaveCriticalSection(&threads_mutex); @@ -1118,9 +1116,6 @@ static void build_wait_tids (gpointer key, gpointer value, gpointer user) if (thread->state & ThreadState_Background) return; /* just leave, ignore */ - if (mono_gc_is_finalizer_thread (thread)) - return; - wait->handles[wait->num]=thread->handle; wait->threads[wait->num]=thread; wait->num++; @@ -1167,13 +1162,9 @@ void mono_thread_manage (void) } while(wait->num>0); g_free (wait); - - EnterCriticalSection(&threads_mutex); - + mono_g_hash_table_destroy(threads); threads=NULL; - - LeaveCriticalSection(&threads_mutex); } static void terminate_thread (gpointer key, gpointer value, gpointer user) diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog index 78b86d86f48..bfa04f3b812 100644 --- a/mono/mini/ChangeLog +++ b/mono/mini/ChangeLog @@ -1,14 +1,3 @@ -2004-02-02 Zoltan Varga <vargaz@freemail.hu> - - * mini.c: Add support for new stringbuilder marshalling conventions. - - * mini.c (mono_method_to_ir): Fix stack management of generic CEE_BOX. - -2004-02-01 Martin Baulig <martin@ximian.com> - - * mini.c (MTYPE_PARAM_TO_TYPE): Method type arguments are stored - in `ginst->mtype_argv'. - 2004-01-31 Miguel de Icaza <miguel@ximian.com> * mini.c: Add comments, replace CEE_XXX+128 with OP_XXX to diff --git a/mono/mini/mini.c b/mono/mini/mini.c index 812656dabbc..9b99a0cb90f 100644 --- a/mono/mini/mini.c +++ b/mono/mini/mini.c @@ -2481,7 +2481,7 @@ inline_method (MonoCompile *cfg, MonoMethod *cmethod, MonoMethodSignature *fsig, #define TYPE_PARAM_TO_TYPE(num) (method->klass->generic_inst->data.generic_inst->type_argv [(num)]) #define TYPE_PARAM_TO_CLASS(num) (mono_class_from_mono_type (TYPE_PARAM_TO_TYPE ((num)))) -#define MTYPE_PARAM_TO_TYPE(num) (((MonoMethodNormal *) method)->header->geninst->mtype_argv [(num)]) +#define MTYPE_PARAM_TO_TYPE(num) (((MonoMethodNormal *) method)->header->geninst->type_argv [(num)]) #define MTYPE_PARAM_TO_CLASS(num) (mono_class_from_mono_type (MTYPE_PARAM_TO_TYPE ((num)))) @@ -4478,7 +4478,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b klass = MTYPE_PARAM_TO_CLASS (klass->byval_arg.data.generic_param->num); if (MONO_TYPE_IS_REFERENCE (&klass->byval_arg)) { - *sp++ = val; + *sp = val; ip += 5; break; } @@ -5012,12 +5012,8 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b func = mono_string_to_ansibstr; break; case MONO_MARSHAL_CONV_SB_LPSTR: - case MONO_MARSHAL_CONV_SB_LPTSTR: func = mono_string_builder_to_utf8; break; - case MONO_MARSHAL_CONV_SB_LPWSTR: - func = mono_string_builder_to_utf16; - break; case MONO_MARSHAL_CONV_ARRAY_SAVEARRAY: func = mono_array_to_savearray; break; @@ -5051,12 +5047,8 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b CHECK_OPSIZE (3); switch (ip [2]) { case MONO_MARSHAL_CONV_LPSTR_SB: - case MONO_MARSHAL_CONV_LPTSTR_SB: func = mono_string_utf8_to_builder; break; - case MONO_MARSHAL_CONV_LPWSTR_SB: - func = mono_string_utf16_to_builder; - break; case MONO_MARSHAL_FREE_ARRAY: func = mono_marshal_free_array; break; @@ -8005,13 +7997,11 @@ mini_init (const char *filename) mono_register_jit_icall (mono_string_to_bstr, "mono_string_to_bstr", helper_sig_ptr_obj, FALSE); mono_register_jit_icall (mono_string_to_ansibstr, "mono_string_to_ansibstr", helper_sig_ptr_obj, FALSE); mono_register_jit_icall (mono_string_builder_to_utf8, "mono_string_builder_to_utf8", helper_sig_ptr_obj, FALSE); - mono_register_jit_icall (mono_string_builder_to_utf16, "mono_string_builder_to_utf16", helper_sig_ptr_obj, FALSE); mono_register_jit_icall (mono_array_to_savearray, "mono_array_to_savearray", helper_sig_ptr_obj, FALSE); mono_register_jit_icall (mono_array_to_lparray, "mono_array_to_lparray", helper_sig_ptr_obj, FALSE); mono_register_jit_icall (mono_delegate_to_ftnptr, "mono_delegate_to_ftnptr", helper_sig_ptr_obj, FALSE); mono_register_jit_icall (mono_marshal_string_array, "mono_marshal_string_array", helper_sig_ptr_obj, FALSE); mono_register_jit_icall (mono_string_utf8_to_builder, "mono_string_utf8_to_builder", helper_sig_void_ptr_ptr, FALSE); - mono_register_jit_icall (mono_string_utf16_to_builder, "mono_string_utf16_to_builder", helper_sig_void_ptr_ptr, FALSE); mono_register_jit_icall (mono_marshal_free_array, "mono_marshal_free_array", helper_sig_void_ptr_ptr, FALSE); mono_register_jit_icall (mono_string_to_byvalstr, "mono_string_to_byvalstr", helper_sig_void_ptr_ptr_ptr, FALSE); mono_register_jit_icall (mono_string_to_byvalwstr, "mono_string_to_byvalwstr", helper_sig_void_ptr_ptr_ptr, FALSE); diff --git a/mono/tests/ChangeLog b/mono/tests/ChangeLog index 97f5886066b..6e94459cef7 100644 --- a/mono/tests/ChangeLog +++ b/mono/tests/ChangeLog @@ -1,14 +1,3 @@ -2004-02-02 Zoltan Varga <vargaz@freemail.hu> - - * pinvoke2.cs libtest.c: Add test for unicode StringBuilder marshalling. - - * pinvoke.cs libtest.c: Add test for Sparc V8 split register/stack double - parameter passing. - -2004-01-31 Zoltan Varga <vargaz@freemail.hu> - - * setenv.cs: Make this run on platforms without setenv. - 2004-01-30 Zoltan Varga <vargaz@freemail.hu> * Makefile.am: Set SHELL to bash, since some commands require it. diff --git a/mono/tests/libtest.c b/mono/tests/libtest.c index 7860d689b5c..2247103a06d 100644 --- a/mono/tests/libtest.c +++ b/mono/tests/libtest.c @@ -145,12 +145,6 @@ mono_test_many_double_arguments (double a, double b, double c, double d, double return a + b + c + d + e + f + g + h + i + j; } -double -mono_test_split_double_arguments (double a, double b, float c, double d, double e) -{ - return a + b + c + d + e; -} - int mono_test_puts_static (char *s) { @@ -551,25 +545,6 @@ mono_test_marshal_stringbuilder (char *s, int n) return 0; } -int -mono_test_marshal_stringbuilder_unicode (gunichar2 *s, int n) -{ - const char m[] = "This is my message. Isn't it nice?"; - gunichar2* s2; - glong len; - - s2 = g_utf8_to_utf16 (m, -1, NULL, &len, NULL); - - len = (len * 2) + 2; - if (len > n) - len = n; - memcpy (s, s2, len); - - g_free (s2); - - return 0; -} - typedef struct { #ifndef __GNUC__ char a; diff --git a/mono/tests/pinvoke.cs b/mono/tests/pinvoke.cs index 9421377621d..b929318a3e4 100755 --- a/mono/tests/pinvoke.cs +++ b/mono/tests/pinvoke.cs @@ -21,8 +21,6 @@ public class Test { [DllImport ("libtest", EntryPoint="mono_test_many_double_arguments")] public static extern double mono_test_many_double_arguments (double a, double b, double c, double d, double e, double f, double g, double h, double i, double j); - [DllImport ("libtest", EntryPoint="mono_test_split_double_arguments")] - public static extern double mono_test_split_double_arguments (double a, double b, float c, double d, double e); public static int Main () { try { @@ -45,10 +43,6 @@ public class Test { return 6; if (mono_test_many_double_arguments (1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0) != 55.0) return 7; - - /* Test Sparc V8 split register/stack double parameter passing */ - if (mono_test_split_double_arguments (1.0, 2.0, 3.0f, 4.0, 5.0) != 15.0) - return 8; return 0; } diff --git a/mono/tests/pinvoke2.cs b/mono/tests/pinvoke2.cs index 9852cffee75..be9e9d4872a 100755 --- a/mono/tests/pinvoke2.cs +++ b/mono/tests/pinvoke2.cs @@ -126,9 +126,6 @@ public class Tests { [DllImport ("libtest", EntryPoint="mono_test_marshal_stringbuilder")] public static extern void mono_test_marshal_stringbuilder (StringBuilder sb, int len); - [DllImport ("libtest", EntryPoint="mono_test_marshal_stringbuilder_unicode", CharSet=CharSet.Unicode)] - public static extern void mono_test_marshal_stringbuilder_unicode (StringBuilder sb, int len); - [DllImport ("libtest", EntryPoint="mono_test_last_error", SetLastError=true)] public static extern void mono_test_last_error (int err); @@ -343,17 +340,6 @@ public class Tests { return 0; } - static int test_0_marshal_stringbuilder_unicode () { - StringBuilder sb = new StringBuilder(255); - mono_test_marshal_stringbuilder_unicode (sb, sb.Capacity); - String res = sb.ToString(); - - if (res != "This is my message. Isn't it nice?") - return 1; - - return 0; - } - static int test_0_last_error () { mono_test_last_error (5); if (Marshal.GetLastWin32Error () == 5) diff --git a/web/crypto b/web/crypto index aca4750470d..8080eb67709 100644 --- a/web/crypto +++ b/web/crypto @@ -374,7 +374,11 @@ algorithm ;-). * Write some documentation on the cryptographic classes for - <b>monodoc</b>. + <b>monodoc</b> as I'm not a very good writer (at least in English). </ul> + + Contact <a href="mailto:spouliot@videotron.ca">Sebastien Pouliot</a> if + you need additional informations about the status of the cryptographic + classes. <hr> -Last reviewed: February 2, 2004 (mono 0.30) +Last reviewed: January 26, 2004 (post mono 0.29) diff --git a/web/pending-classes.in b/web/pending-classes.in deleted file mode 100644 index 1cdb5a4cb36..00000000000 --- a/web/pending-classes.in +++ /dev/null @@ -1,246 +0,0 @@ -System.Object -System.Exception -System.ValueType -System.Delegate -System.MulticastDelegate -System.Enum -System.Activator -System.ArgIterator -System.__ComObject -System.TypedReference -System.Security.AllowPartiallyTrustedCallersAttribute -System.Runtime.Serialization.Formatter -System.Runtime.Serialization.FormatterConverter -System.Runtime.Serialization.FormatterServices -System.Runtime.Serialization.ObjectIDGenerator -System.Runtime.Serialization.ObjectManager -System.Reflection.ModuleResolveEventHandler -System.Reflection.Pointer -System.Globalization.CompareInfo -System.Globalization.HebrewCalendar -System.Globalization.HijriCalendar -System.Globalization.JapaneseCalendar -System.Globalization.KoreanCalendar -System.Globalization.SortKey -System.Globalization.StringInfo -System.Globalization.TaiwanCalendar -System.Globalization.TextElementEnumerator -System.Globalization.TextInfo -System.Globalization.ThaiBuddhistCalendar -System.IO.IsolatedStorage.IsolatedStorageFile -System.Reflection.Emit.MethodRental -System.Runtime.CompilerServices.AccessedThroughPropertyAttribute -System.Runtime.CompilerServices.CallConvCdecl -System.Runtime.CompilerServices.CallConvStdcall -System.Runtime.CompilerServices.CallConvThiscall -System.Runtime.CompilerServices.CallConvFastcall -System.Runtime.CompilerServices.CustomConstantAttribute -System.Runtime.CompilerServices.DateTimeConstantAttribute -System.Runtime.CompilerServices.DiscardableAttribute -System.Runtime.CompilerServices.DecimalConstantAttribute -System.Runtime.CompilerServices.CompilationRelaxationsAttribute -System.Runtime.CompilerServices.CompilerGlobalScopeAttribute -System.Runtime.CompilerServices.IDispatchConstantAttribute -System.Runtime.CompilerServices.IsVolatile -System.Runtime.CompilerServices.IUnknownConstantAttribute -System.Runtime.CompilerServices.RequiredAttributeAttribute -System.Runtime.InteropServices.ArrayWithOffset -System.Runtime.InteropServices.DispIdAttribute -System.Runtime.InteropServices.ClassInterfaceType -System.Runtime.InteropServices.ClassInterfaceAttribute -System.Runtime.InteropServices.ComVisibleAttribute -System.Runtime.InteropServices.LCIDConversionAttribute -System.Runtime.InteropServices.ComRegisterFunctionAttribute -System.Runtime.InteropServices.ComUnregisterFunctionAttribute -System.Runtime.InteropServices.ProgIdAttribute -System.Runtime.InteropServices.ImportedFromTypeLibAttribute -System.Runtime.InteropServices.IDispatchImplType -System.Runtime.InteropServices.IDispatchImplAttribute -System.Runtime.InteropServices.ComSourceInterfacesAttribute -System.Runtime.InteropServices.ComConversionLossAttribute -System.Runtime.InteropServices.TypeLibTypeFlags -System.Runtime.InteropServices.TypeLibFuncFlags -System.Runtime.InteropServices.TypeLibVarFlags -System.Runtime.InteropServices.TypeLibTypeAttribute -System.Runtime.InteropServices.TypeLibFuncAttribute -System.Runtime.InteropServices.TypeLibVarAttribute -System.Runtime.InteropServices.ComImportAttribute -System.Runtime.InteropServices.PreserveSigAttribute -System.Runtime.InteropServices.ComAliasNameAttribute -System.Runtime.InteropServices.AutomationProxyAttribute -System.Runtime.InteropServices.PrimaryInteropAssemblyAttribute -System.Runtime.InteropServices.CoClassAttribute -System.Runtime.InteropServices.ComEventInterfaceAttribute -System.Runtime.InteropServices.COMException -System.Runtime.InteropServices.ComMemberType -System.Runtime.InteropServices.CurrencyWrapper -System.Runtime.InteropServices.DispatchWrapper -System.Runtime.InteropServices.ErrorWrapper -System.Runtime.InteropServices.ExtensibleClassFactory -System.Runtime.InteropServices.HandleRef -System.Runtime.InteropServices.InvalidComObjectException -System.Runtime.InteropServices.InvalidOleVariantTypeException -System.Runtime.InteropServices.TypeLibImporterFlags -System.Runtime.InteropServices.ExporterEventKind -System.Runtime.InteropServices.ITypeLibExporterNotifySink -System.Runtime.InteropServices.ITypeLibConverter -System.Runtime.InteropServices.MarshalDirectiveException -System.Runtime.InteropServices.ObjectCreationDelegate -System.Runtime.InteropServices.RuntimeEnvironment -System.Runtime.InteropServices.RegistrationServices -System.Runtime.InteropServices.SafeArrayRankMismatchException -System.Runtime.InteropServices.SafeArrayTypeMismatchException -System.Runtime.InteropServices.SEHException -System.Runtime.InteropServices.TypeLibConverter -System.Runtime.InteropServices.BIND_OPTS -System.Runtime.InteropServices.UCOMIBindCtx -System.Runtime.InteropServices.UCOMIConnectionPointContainer -System.Runtime.InteropServices.UCOMIConnectionPoint -System.Runtime.InteropServices.UCOMIEnumMoniker -System.Runtime.InteropServices.CONNECTDATA -System.Runtime.InteropServices.UCOMIEnumConnections -System.Runtime.InteropServices.UCOMIEnumConnectionPoints -System.Runtime.InteropServices.UCOMIEnumString -System.Runtime.InteropServices.UCOMIEnumVARIANT -System.Runtime.InteropServices.FILETIME -System.Runtime.InteropServices.UCOMIMoniker -System.Runtime.InteropServices.UCOMIPersistFile -System.Runtime.InteropServices.UCOMIRunningObjectTable -System.Runtime.InteropServices.STATSTG -System.Runtime.InteropServices.UCOMIStream -System.Runtime.InteropServices.DESCKIND -System.Runtime.InteropServices.BINDPTR -System.Runtime.InteropServices.UCOMITypeComp -System.Runtime.InteropServices.TYPEKIND -System.Runtime.InteropServices.TYPEFLAGS -System.Runtime.InteropServices.IMPLTYPEFLAGS -System.Runtime.InteropServices.TYPEATTR -System.Runtime.InteropServices.FUNCDESC -System.Runtime.InteropServices.IDLFLAG -System.Runtime.InteropServices.IDLDESC -System.Runtime.InteropServices.PARAMFLAG -System.Runtime.InteropServices.PARAMDESC -System.Runtime.InteropServices.TYPEDESC -System.Runtime.InteropServices.ELEMDESC -System.Runtime.InteropServices.VARDESC -System.Runtime.InteropServices.DISPPARAMS -System.Runtime.InteropServices.EXCEPINFO -System.Runtime.InteropServices.FUNCKIND -System.Runtime.InteropServices.INVOKEKIND -System.Runtime.InteropServices.CALLCONV -System.Runtime.InteropServices.FUNCFLAGS -System.Runtime.InteropServices.VARFLAGS -System.Runtime.InteropServices.UCOMITypeInfo -System.Runtime.InteropServices.SYSKIND -System.Runtime.InteropServices.LIBFLAGS -System.Runtime.InteropServices.TYPELIBATTR -System.Runtime.InteropServices.UCOMITypeLib -System.Runtime.InteropServices.UnknownWrapper -System.Runtime.Remoting.IObjectHandle -System.Runtime.Remoting.IRemotingTypeInfo -System.Runtime.Remoting.IChannelInfo -System.Runtime.Remoting.IEnvoyInfo -System.Runtime.Remoting.RemotingConfiguration -System.Runtime.Remoting.TypeEntry -System.Runtime.Remoting.ActivatedClientTypeEntry -System.Runtime.Remoting.ActivatedServiceTypeEntry -System.Runtime.Remoting.WellKnownClientTypeEntry -System.Runtime.Remoting.WellKnownServiceTypeEntry -System.Runtime.Remoting.RemotingException -System.Runtime.Remoting.ServerException -System.Runtime.Remoting.RemotingTimeoutException -System.Runtime.Remoting.RemotingServices -System.Runtime.Remoting.InternalRemotingServices -System.Runtime.Remoting.SoapServices -System.Runtime.Remoting.Activation.UrlAttribute -System.Runtime.Remoting.Messaging.IMessageSink -System.Runtime.Remoting.Messaging.AsyncResult -System.Runtime.Remoting.Messaging.CallContext -System.Runtime.Remoting.Messaging.ILogicalThreadAffinative -System.Runtime.Remoting.Messaging.InternalMessageWrapper -System.Runtime.Remoting.Messaging.IMethodCallMessage -System.Runtime.Remoting.Messaging.MethodCallMessageWrapper -System.Runtime.Remoting.Messaging.HeaderHandler -System.Runtime.Remoting.Messaging.IMessageCtrl -System.Runtime.Remoting.Messaging.IRemotingFormatter -System.Runtime.Remoting.Messaging.ReturnMessage -System.Runtime.Remoting.Messaging.MethodCall -System.Runtime.Remoting.Messaging.ConstructionCall -System.Runtime.Remoting.Messaging.MethodResponse -System.Runtime.Remoting.Messaging.ConstructionResponse -System.Runtime.Remoting.Messaging.MethodReturnMessageWrapper -System.Runtime.Remoting.Messaging.OneWayAttribute -System.Runtime.Remoting.Messaging.MessageSurrogateFilter -System.Runtime.Remoting.Messaging.RemotingSurrogateSelector -System.Runtime.Remoting.Contexts.CrossContextDelegate -System.Runtime.Remoting.Contexts.ContextProperty -System.Runtime.Remoting.Contexts.IContextPropertyActivator -System.Runtime.Remoting.Contexts.IContributeClientContextSink -System.Runtime.Remoting.Contexts.IContributeDynamicSink -System.Runtime.Remoting.Contexts.IContributeEnvoySink -System.Runtime.Remoting.Contexts.IContributeObjectSink -System.Runtime.Remoting.Contexts.IContributeServerContextSink -System.Runtime.Serialization.Formatters.InternalRM -System.Runtime.Serialization.Formatters.InternalST -System.Runtime.Serialization.Formatters.SoapMessage -System.Runtime.Serialization.Formatters.SoapFault -System.Runtime.Serialization.Formatters.ServerFault -System.Runtime.Serialization.Formatters.Binary.BinaryFormatter -System.Security.Cryptography.CryptoConfig -System.Security.Cryptography.KeyedHashAlgorithm -System.Security.Cryptography.HMACSHA1 -System.Security.Cryptography.MACTripleDES -System.Security.Cryptography.MaskGenerationMethod -System.Security.Cryptography.PasswordDeriveBytes -System.Security.Cryptography.PKCS1MaskGenerationMethod -System.Security.Cryptography.RC2 -System.Security.Cryptography.RC2CryptoServiceProvider -System.Security.Cryptography.RSACryptoServiceProvider -System.Security.Cryptography.RSAOAEPKeyExchangeDeformatter -System.Security.Cryptography.RSAOAEPKeyExchangeFormatter -System.Security.Cryptography.RSAPKCS1KeyExchangeDeformatter -System.Security.Cryptography.RSAPKCS1KeyExchangeFormatter -System.Security.Cryptography.RSAPKCS1SignatureDeformatter -System.Security.Cryptography.RSAPKCS1SignatureFormatter -System.Security.Cryptography.SHA1Managed -System.Security.Cryptography.TripleDES -System.Security.Cryptography.TripleDESCryptoServiceProvider -System.Security.Permissions.EnvironmentPermission -System.Security.Permissions.FileDialogPermission -System.Security.Permissions.IsolatedStorageFilePermission -System.Security.Permissions.PrincipalPermissionAttribute -System.Security.Permissions.SecurityPermissionAttribute -System.Security.Permissions.PublisherIdentityPermissionAttribute -System.Security.Permissions.PublisherIdentityPermission -System.Security.Permissions.ReflectionPermission -System.Security.Permissions.RegistryPermission -System.Security.Permissions.PrincipalPermission -System.Security.Permissions.SiteIdentityPermission -System.Security.Permissions.StrongNameIdentityPermission -System.Security.Permissions.StrongNamePublicKeyBlob -System.Security.Permissions.UIPermission -System.Security.Permissions.UrlIdentityPermission -System.Security.Permissions.ZoneIdentityPermission -System.Security.Policy.ApplicationDirectory -System.Security.Policy.ApplicationDirectoryMembershipCondition -System.Security.Policy.FirstMatchCodeGroup -System.Security.Policy.Hash -System.Security.Policy.HashMembershipCondition -System.Security.Policy.NetCodeGroup -System.Security.Policy.PermissionRequestEvidence -System.Security.Policy.Publisher -System.Security.Policy.PublisherMembershipCondition -System.Security.Policy.Site -System.Security.Policy.SiteMembershipCondition -System.Security.Policy.StrongName -System.Security.Policy.StrongNameMembershipCondition -System.Security.Policy.UnionCodeGroup -System.Security.Policy.Url -System.Security.Policy.UrlMembershipCondition -System.Security.Policy.Zone -System.Security.Policy.ZoneMembershipCondition -System.Security.Principal.WindowsIdentity -System.Security.Principal.WindowsImpersonationContext -System.Security.Principal.WindowsPrincipal -System.Threading.CompressedStack -
diff --git a/web/web/team.xml b/web/web/team.xml index 73dae776c4c..6b7e7a7e1bf 100644 --- a/web/web/team.xml +++ b/web/web/team.xml @@ -562,13 +562,13 @@ </name> - <e-mail>sebastien at ximian dot com</e-mail> + <e-mail>spouliot@motus.com</e-mail> <image>spouliot.png</image> <location>Quebec City, Canada</location> - <organization>Novell Ximian</organization> + <organization>Motus Technologies</organization> <description>Cryptoman</description> |