mirror of
https://github.com/BepInEx/mono.git
synced 2026-11-17 01:41:17 -10:00
Compare commits
20
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ad29bc9c31 | ||
|
|
fbe543ea49 | ||
|
|
e1fa37b513 | ||
|
|
089bcfe27c | ||
|
|
2dbb2f7a7d | ||
|
|
6f390f39ea | ||
|
|
5c2e969ce7 | ||
|
|
d0917acb68 | ||
|
|
378e6334c8 | ||
|
|
2bc72fbb56 | ||
|
|
72415acc05 | ||
|
|
b64c632a37 | ||
|
|
f2631aa17b | ||
|
|
342e840c5d | ||
|
|
767cf2983d | ||
|
|
429051acb3 | ||
|
|
b28e8eb771 | ||
|
|
2b18ed7e05 | ||
|
|
d4acb77ad9 | ||
|
|
d840a80749 |
No files matched your search
@@ -1,18 +1,12 @@
|
||||
2005-12-21 Wade Berrier <[email protected]>
|
||||
|
||||
* mono-cairo.pc.in: use $prefix/lib instead of $libdir,
|
||||
* mono-cairo.pc.in: use $prefix/lib instead of $libdir,
|
||||
otherwise the cairo.dll can't be found on 64 bit architectures
|
||||
(Merged from trunk)
|
||||
|
||||
2005-12-18 Raja R Harinath <harinath@gmail.com>
|
||||
2005-12-14 Wade Berrier <wberrier@novell.com>
|
||||
|
||||
* configure.in (config.make): Don't blindly copy over $INSTALL,
|
||||
since it can be relative to the mono tree. Use the same trick as
|
||||
ac_INSTALL, but against an absolute path.
|
||||
|
||||
2005-12-16 Wade Berrier <[email protected]>
|
||||
|
||||
* configure.in: Unset AC_DISABLE_FAST_INSTALL
|
||||
This caused some weird monodis linking errors
|
||||
* configure.in (AC_DISABLE_FAST_INSTALL): unset.
|
||||
|
||||
2005-12-12 Mike Kestner <[email protected]>
|
||||
|
||||
|
||||
+4
-9
@@ -6,7 +6,7 @@ AC_CANONICAL_SYSTEM
|
||||
m4_ifdef([_A][M_PROG_TAR],[_A][M_SET_OPTION([tar-ustar])])
|
||||
|
||||
AM_CONFIG_HEADER(config.h)
|
||||
AM_INIT_AUTOMAKE(mono,1.1.11)
|
||||
AM_INIT_AUTOMAKE(mono,1.1.12.1)
|
||||
AM_MAINTAINER_MODE
|
||||
|
||||
AC_PROG_LN_S
|
||||
@@ -263,7 +263,8 @@ AM_CONDITIONAL(CROSS_COMPILING, [test x$cross_compiling = xyes])
|
||||
# Set STDC_HEADERS
|
||||
AC_HEADER_STDC
|
||||
AC_LIBTOOL_WIN32_DLL
|
||||
# This causes monodis to not link correctly
|
||||
# Disabling because it causes some weird monodis linking
|
||||
# problems if /usr/libmono.so isn't install on system
|
||||
#AC_DISABLE_FAST_INSTALL
|
||||
AM_PROG_LIBTOOL
|
||||
|
||||
@@ -1851,13 +1852,7 @@ fi
|
||||
echo 'IL_FLAGS = /debug' >> $srcdir/$mcsdir/build/config.make
|
||||
echo "RUNTIME = $mono_build_root/runtime/mono-wrapper" >> $srcdir/$mcsdir/build/config.make
|
||||
echo "ILDISASM = $mono_build_root/runtime/monodis-wrapper" >> $srcdir/$mcsdir/build/config.make
|
||||
|
||||
case $INSTALL in
|
||||
[[\\/$]]* | ?:[[\\/]]* ) mcs_INSTALL=$INSTALL ;;
|
||||
*) mcs_INSTALL=$mono_build_root/$INSTALL ;;
|
||||
esac
|
||||
|
||||
echo "INSTALL = $mcs_INSTALL" >> $srcdir/$mcsdir/build/config.make
|
||||
echo "INSTALL = $INSTALL" >> $srcdir/$mcsdir/build/config.make
|
||||
|
||||
export VERSION
|
||||
[myver=$($AWK 'BEGIN {
|
||||
|
||||
@@ -1,7 +1,3 @@
|
||||
2005-12-20 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* RdpPattern.cs : cache ContentType and save speed.
|
||||
|
||||
2005-09-20 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* Util.cs : Added name class analysis support. The algorithm is at
|
||||
|
||||
@@ -590,21 +590,17 @@ namespace Commons.Xml.Relaxng.Derivative
|
||||
get { return r; }
|
||||
set { r = value; }
|
||||
}
|
||||
|
||||
RdpContentType computedContentType = RdpContentType.Invalid;
|
||||
|
||||
public override RdpContentType ContentType {
|
||||
get {
|
||||
if (computedContentType == RdpContentType.Invalid) {
|
||||
if (l.ContentType == RdpContentType.Empty)
|
||||
computedContentType = r.ContentType;
|
||||
else if (r.ContentType == RdpContentType.Empty)
|
||||
computedContentType = l.ContentType;
|
||||
else if ((l.ContentType & RdpContentType.Simple) != 0 || ((r.ContentType & RdpContentType.Simple) != 0))
|
||||
throw new RelaxngException ("The content type of this group is invalid.");
|
||||
else
|
||||
computedContentType = RdpContentType.Complex;
|
||||
}
|
||||
return computedContentType;
|
||||
if (l.ContentType == RdpContentType.Empty)
|
||||
return r.ContentType;
|
||||
if (r.ContentType == RdpContentType.Empty)
|
||||
return l.ContentType;
|
||||
|
||||
if ((l.ContentType & RdpContentType.Simple) != 0 || ((r.ContentType & RdpContentType.Simple) != 0))
|
||||
throw new RelaxngException ("The content type of this group is invalid.");
|
||||
return RdpContentType.Complex;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -708,21 +704,16 @@ namespace Commons.Xml.Relaxng.Derivative
|
||||
public override RelaxngPatternType PatternType {
|
||||
get { return RelaxngPatternType.Choice; }
|
||||
}
|
||||
|
||||
RdpContentType computedContentType = RdpContentType.Invalid;
|
||||
|
||||
public override RdpContentType ContentType {
|
||||
get {
|
||||
if (computedContentType == RdpContentType.Invalid) {
|
||||
if (LValue.ContentType == RdpContentType.Simple ||
|
||||
RValue.ContentType == RdpContentType.Simple)
|
||||
computedContentType = RdpContentType.Simple;
|
||||
else
|
||||
computedContentType = base.ContentType;
|
||||
}
|
||||
return computedContentType;
|
||||
get {
|
||||
if (LValue.ContentType == RdpContentType.Simple ||
|
||||
RValue.ContentType == RdpContentType.Simple)
|
||||
return RdpContentType.Simple;
|
||||
return base.ContentType;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public override void GetLabels (LabelList elements, LabelList attributes, bool collectNameClass)
|
||||
{
|
||||
LValue.GetLabels (elements, attributes, collectNameClass);
|
||||
|
||||
@@ -1,33 +1,3 @@
|
||||
2005-12-16 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* RncWriter.cs : it needs another namespace resolver for datatypes.
|
||||
|
||||
2005-12-16 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* RncWriter.cs : actually no need to change signature; use
|
||||
GetNamespacesInScope().
|
||||
|
||||
2005-12-16 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* RncWriter.cs : use XmlNamespaceManager for NSResolver even in NET_2_0.
|
||||
|
||||
2005-12-16 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* RncWriter.cs : another escapement is required.
|
||||
|
||||
2005-12-16 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* RncWriter.cs : oops, missing keyword escapement.
|
||||
|
||||
2005-12-16 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* RncWriter.cs : no xsi in grammar, please.
|
||||
|
||||
2005-12-16 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* RncWriter.cs : added WriteNamespaces() to handle namespace output
|
||||
by itself.
|
||||
|
||||
2005-03-28 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* RncTokenizer.cs : check names strictly.
|
||||
|
||||
@@ -51,77 +51,26 @@ namespace Commons.Xml.Relaxng.Rnc
|
||||
XmlNamespaceManager n = new XmlNamespaceManager (
|
||||
new NameTable ());
|
||||
n.AddNamespace ("xs", "http://www.w3.org/2001/XMLSchema-datatypes");
|
||||
n.AddNamespace ("xsi", "http://www.w3.org/2001/XMLSchema-instance");
|
||||
defaultNamespaceManager = n;
|
||||
}
|
||||
|
||||
TextWriter w;
|
||||
NSResolver nsmgr;
|
||||
NSResolver datansmgr;
|
||||
|
||||
public RncWriter (TextWriter writer)
|
||||
: this (writer, null, defaultNamespaceManager)
|
||||
: this (writer, defaultNamespaceManager)
|
||||
{
|
||||
}
|
||||
|
||||
public RncWriter (TextWriter writer, NSResolver nsmgr)
|
||||
: this (writer, nsmgr, defaultNamespaceManager)
|
||||
{
|
||||
}
|
||||
|
||||
public RncWriter (TextWriter writer, NSResolver structureNamespaces, NSResolver dataNamespaces)
|
||||
{
|
||||
this.w = writer;
|
||||
this.nsmgr = structureNamespaces;
|
||||
this.datansmgr = dataNamespaces;
|
||||
XmlNameTable nt = GetNameTable (nsmgr, datansmgr);
|
||||
if (nsmgr == null)
|
||||
nsmgr = new XmlNamespaceManager (nt);
|
||||
if (datansmgr == null)
|
||||
datansmgr = new XmlNamespaceManager (nt);
|
||||
this.nsmgr = nsmgr;
|
||||
}
|
||||
|
||||
#region Utility methods
|
||||
|
||||
private XmlNameTable GetNameTable (NSResolver nss1, NSResolver nss2)
|
||||
{
|
||||
XmlNameTable nt = null;
|
||||
if (nss1 is XmlNamespaceManager)
|
||||
nt = ((XmlNamespaceManager) nss1).NameTable;
|
||||
if (nss2 is XmlNamespaceManager)
|
||||
nt = ((XmlNamespaceManager) nss2).NameTable;
|
||||
if (nt == null)
|
||||
nt = new NameTable ();
|
||||
return nt;
|
||||
}
|
||||
|
||||
private bool IsKeyword (string name)
|
||||
{
|
||||
switch (name) {
|
||||
case "attribute":
|
||||
case "default":
|
||||
case "datatypes":
|
||||
case "div":
|
||||
case "element":
|
||||
case "empty":
|
||||
case "external":
|
||||
case "grammar":
|
||||
case "include":
|
||||
case "inherit":
|
||||
case "list":
|
||||
case "mixed":
|
||||
case "namespace":
|
||||
case "notAllowed":
|
||||
case "parent":
|
||||
case "start":
|
||||
case "string":
|
||||
case "text":
|
||||
case "token":
|
||||
return true;
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
private void WriteNames (RelaxngNameClassList l, bool wrap)
|
||||
{
|
||||
switch (l.Count) {
|
||||
@@ -188,41 +137,30 @@ namespace Commons.Xml.Relaxng.Rnc
|
||||
RelaxngGrammarContentList divs,
|
||||
RelaxngGrammarContentList includes)
|
||||
{
|
||||
if (includes != null) {
|
||||
if (includes != null)
|
||||
foreach (RelaxngInclude inc in includes)
|
||||
inc.WriteRnc (this);
|
||||
w.WriteLine ();
|
||||
}
|
||||
if (divs != null) {
|
||||
if (divs != null)
|
||||
foreach (RelaxngDiv div in divs)
|
||||
div.WriteRnc (this);
|
||||
w.WriteLine ();
|
||||
}
|
||||
if (starts != null) {
|
||||
if (starts != null)
|
||||
foreach (RelaxngStart s in starts)
|
||||
s.WriteRnc (this);
|
||||
w.WriteLine ();
|
||||
}
|
||||
if (defines != null)
|
||||
foreach (RelaxngDefine def in defines)
|
||||
def.WriteRnc (this);
|
||||
}
|
||||
|
||||
private void WriteQName (string name, string ns)
|
||||
{
|
||||
WriteQName (name, ns, nsmgr);
|
||||
}
|
||||
|
||||
private void WriteQName (string name, string ns, NSResolver nss)
|
||||
{
|
||||
string prefix = String.Empty;
|
||||
if (ns != null && ns != String.Empty) {
|
||||
#if NET_2_0
|
||||
#else
|
||||
// XmlNamespaceManager sucks.
|
||||
ns = nss.NameTable.Add (ns);
|
||||
ns = nsmgr.NameTable.Add (ns);
|
||||
#endif
|
||||
prefix = nss.LookupPrefix (ns);
|
||||
prefix = nsmgr.LookupPrefix (ns);
|
||||
}
|
||||
if (prefix == null)
|
||||
throw new RelaxngException (String.Format ("Namespace '{0}' is not mapped to a prefix in argument XmlNamespaceManager.", ns));
|
||||
@@ -230,8 +168,6 @@ namespace Commons.Xml.Relaxng.Rnc
|
||||
w.Write (prefix);
|
||||
w.Write (':');
|
||||
}
|
||||
if (IsKeyword (name))
|
||||
w.Write ('\\');
|
||||
w.Write (name);
|
||||
}
|
||||
|
||||
@@ -262,49 +198,6 @@ namespace Commons.Xml.Relaxng.Rnc
|
||||
|
||||
#endregion
|
||||
|
||||
public void WriteNamespaces (string defaultNamespace)
|
||||
{
|
||||
WriteNamespaces (defaultNamespace, nsmgr, false);
|
||||
WriteNamespaces (null, datansmgr, true);
|
||||
}
|
||||
|
||||
public void WriteNamespaces (string defaultNamespace, NSResolver nsmgr, bool isData)
|
||||
{
|
||||
if (defaultNamespace == null)
|
||||
defaultNamespace = String.Empty;
|
||||
|
||||
if (defaultNamespace.Length > 0)
|
||||
w.WriteLine ("default namespace = {0}",
|
||||
defaultNamespace);
|
||||
|
||||
if (nsmgr != null) {
|
||||
#if NET_2_0
|
||||
foreach (string s in nsmgr.GetNamespacesInScope (
|
||||
XmlNamespaceScope.All).Keys) {
|
||||
#else
|
||||
foreach (string s in nsmgr) {
|
||||
#endif
|
||||
switch (s) {
|
||||
case "xml":
|
||||
case "xmlns":
|
||||
continue;
|
||||
case "":
|
||||
if (defaultNamespace.Length > 0)
|
||||
w.WriteLine ("default namespace = '{0}'",
|
||||
nsmgr.LookupNamespace (s).Replace ('\'', '\"'));
|
||||
break;
|
||||
default:
|
||||
w.WriteLine ("{2} {0} = '{1}'",
|
||||
s,
|
||||
nsmgr.LookupNamespace (s).Replace ('\'', '\"'),
|
||||
isData ? "datatypes" : "namespace");
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
w.WriteLine ();
|
||||
}
|
||||
|
||||
#region Elements
|
||||
// Note that it might not be used directly when a grammar
|
||||
// contains more than one "start" (compact syntax does not
|
||||
@@ -326,8 +219,6 @@ namespace Commons.Xml.Relaxng.Rnc
|
||||
// (compact syntax does not support "combine" attribute).
|
||||
public void WriteDefine (RelaxngDefine define)
|
||||
{
|
||||
if (IsKeyword (define.Name))
|
||||
w.Write ('\\');
|
||||
w.Write (define.Name);
|
||||
if (define.Combine == null)
|
||||
w.Write (" = ");
|
||||
@@ -344,7 +235,6 @@ namespace Commons.Xml.Relaxng.Rnc
|
||||
}
|
||||
}
|
||||
w.WriteLine ();
|
||||
w.WriteLine ();
|
||||
}
|
||||
|
||||
public void WriteInclude (RelaxngInclude include)
|
||||
@@ -390,7 +280,7 @@ namespace Commons.Xml.Relaxng.Rnc
|
||||
|
||||
public void WriteData (RelaxngData data)
|
||||
{
|
||||
WriteQName (data.Type, data.DatatypeLibrary, datansmgr);
|
||||
WriteQName (data.Type, data.DatatypeLibrary);
|
||||
if (data.ParamList.Count > 0) {
|
||||
w.Write (" { ");
|
||||
foreach (RelaxngParam p in data.ParamList)
|
||||
@@ -403,7 +293,7 @@ namespace Commons.Xml.Relaxng.Rnc
|
||||
|
||||
public void WriteValue (RelaxngValue v)
|
||||
{
|
||||
WriteQName (v.Type, v.DatatypeLibrary, datansmgr);
|
||||
WriteQName (v.Type, v.DatatypeLibrary);
|
||||
w.Write (' ');
|
||||
WriteLiteral (v.Value);
|
||||
}
|
||||
@@ -445,16 +335,12 @@ namespace Commons.Xml.Relaxng.Rnc
|
||||
|
||||
public void WriteRef (RelaxngRef r)
|
||||
{
|
||||
if (IsKeyword (r.Name))
|
||||
w.Write ('\\');
|
||||
w.Write (r.Name);
|
||||
}
|
||||
|
||||
public void WriteParentRef (RelaxngParentRef r)
|
||||
{
|
||||
w.Write ("parent ");
|
||||
if (IsKeyword (r.Name))
|
||||
w.Write ('\\');
|
||||
w.Write (r.Name);
|
||||
w.Write (' ');
|
||||
}
|
||||
@@ -502,8 +388,6 @@ namespace Commons.Xml.Relaxng.Rnc
|
||||
|
||||
public void WriteParam (RelaxngParam p)
|
||||
{
|
||||
if (IsKeyword (p.Name))
|
||||
w.Write ('\\');
|
||||
w.Write (p.Name);
|
||||
w.Write (" = ");
|
||||
WriteLiteral (p.Value);
|
||||
|
||||
@@ -1,13 +1,3 @@
|
||||
2005-12-16 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* RelaxngPattern.cs : RelaxngData and RelaxngValue was writing QName
|
||||
instead of NCName for type attribute (wrong).
|
||||
|
||||
2005-12-16 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* RelaxngPattern.cs : in WriteCompact(), use WriteNamespace() to
|
||||
let RncWriter handle namespace output by itself.
|
||||
|
||||
2005-09-20 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* RelaxngValidatingReader.cs : added explicit error message for
|
||||
|
||||
@@ -512,20 +512,17 @@ namespace Commons.Xml.Relaxng
|
||||
|
||||
public void WriteCompact (TextWriter writer)
|
||||
{
|
||||
WriteCompact (new RncWriter (writer));
|
||||
WriteRnc (new RncWriter (writer));
|
||||
}
|
||||
|
||||
public void WriteCompact (TextWriter writer, NSResolver res)
|
||||
{
|
||||
WriteCompact (new RncWriter (writer, res));
|
||||
}
|
||||
|
||||
void WriteCompact (RncWriter writer)
|
||||
{
|
||||
RelaxngGrammar g = this as RelaxngGrammar;
|
||||
string ns = (g != null ? g.DefaultNamespace : null);
|
||||
writer.WriteNamespaces (ns);
|
||||
WriteRnc (writer);
|
||||
if (g != null && g.DefaultNamespace != null) {
|
||||
writer.Write ("default namespace = ");
|
||||
writer.WriteLine (g.DefaultNamespace);
|
||||
}
|
||||
WriteRnc (new RncWriter (writer, res));
|
||||
}
|
||||
|
||||
// Internal
|
||||
@@ -750,8 +747,10 @@ namespace Commons.Xml.Relaxng
|
||||
{
|
||||
writer.WriteStartElement ("", "data", RelaxngGrammar.NamespaceURI);
|
||||
if (DatatypeLibrary != null && DatatypeLibrary != String.Empty)
|
||||
writer.WriteAttributeString ("datatypeLibrary", DatatypeLibrary);
|
||||
writer.WriteAttributeString ("type", Type);
|
||||
writer.WriteAttributeString ("xmlns", "data", "http://www.w3.org/2000/xmlns/", DatatypeLibrary);
|
||||
writer.WriteStartAttribute ("type", String.Empty);
|
||||
writer.WriteQualifiedName (Type, DatatypeLibrary);
|
||||
writer.WriteEndAttribute ();
|
||||
|
||||
foreach (RelaxngParam p in ParamList)
|
||||
p.Write (writer);
|
||||
@@ -814,8 +813,9 @@ namespace Commons.Xml.Relaxng
|
||||
if (Type != null) {
|
||||
writer.WriteStartAttribute ("type", String.Empty);
|
||||
if (DatatypeLibrary != null && DatatypeLibrary != String.Empty)
|
||||
writer.WriteAttributeString ("datatypeLibrary", DatatypeLibrary);
|
||||
writer.WriteAttributeString ("type", Type);
|
||||
writer.WriteAttributeString ("xmlns", "data", "http://www.w3.org/2000/xmlns/", DatatypeLibrary);
|
||||
writer.WriteQualifiedName (Type, DatatypeLibrary);
|
||||
writer.WriteEndAttribute ();
|
||||
}
|
||||
writer.WriteString (Value);
|
||||
writer.WriteEndElement ();
|
||||
|
||||
@@ -1,95 +1,3 @@
|
||||
2005-12-21 Peter Dennis Bartok <[email protected]>
|
||||
|
||||
* XplatUIWin32.cs: Fixed the TEXTMETRIC structure, we were calling
|
||||
a Unicode function with a structure that was defined in Ansi way.
|
||||
This fixes #76942.
|
||||
|
||||
2005-12-21 Jackson Harper <[email protected]>
|
||||
|
||||
* StatusBar.cs: Statusbar handles its fore/back colours on it's
|
||||
on. Because thats how it rolls. (and this avoids it using ambient
|
||||
colours).
|
||||
* ThemeWin32Classic.cs: Use the proper back color for filling.
|
||||
* Menu.cs: Use the system menu bar color for drawing menu
|
||||
bars. Using the window back color will bring ambient colours into
|
||||
the picture.
|
||||
|
||||
2005-12-21 Alexander Olk <[email protected]>
|
||||
|
||||
* ColorDialog.cs: Fixed a memory leak that caused a SIGSEV. A lot of
|
||||
Bitmaps were created and not disposed.
|
||||
|
||||
2005-12-21 Peter Dennis Bartok <[email protected]>
|
||||
|
||||
* Control.cs (CreateControl): Don't do anything if the control is
|
||||
already created, otherwise we'd fire the OnCreated event more than
|
||||
once
|
||||
|
||||
2005-12-21 Peter Dennis Bartok <[email protected]>
|
||||
|
||||
* ComboBox.cs (FindStringCaseInsensitive): Don't search for emtpy strings,
|
||||
will always match. Instead return -1. Fixes #76464.
|
||||
|
||||
2005-12-21 Peter Dennis Bartok <[email protected]>
|
||||
|
||||
* TextControl.cs (RecalculateLine): Only wrap if the wrap point is
|
||||
neither the beginning nor the end of the line (Fixes bug #76479)
|
||||
|
||||
2005-12-21 Peter Dennis Bartok <[email protected]>
|
||||
|
||||
* Control.cs:
|
||||
- ControlNativeWindow.ControlFromHandle(): Now handling situation
|
||||
where handle is invalid
|
||||
- FromHandle(): Now using hashtable-based ControlFromHandle() lookup
|
||||
instead of slower linear search
|
||||
* NativeWindow.cs: Don't remove the window from the hashtable until
|
||||
after the driver has destroyed it (since the driver might use
|
||||
Control.FromHandle to lookup the control object
|
||||
* Hwnd.cs: Added DestroyPending property to track if a window is
|
||||
already destroyed as far as the driver is concerned and only hasn't
|
||||
yet notified the control
|
||||
* XplatUIX11.cs:
|
||||
- Activate(): Check if the window is still valid before using the
|
||||
handle
|
||||
- Implemented DestroyChildWindow() method to mark child windows as
|
||||
destroyed when a window is destroyed. This prevents situations
|
||||
where we might call an X method based on queued events for a
|
||||
window that already has been destroyed but we haven't yet pulled
|
||||
the destroy method from the queue.
|
||||
- Added a call to the new DestroyChildWindow() method to the drivers
|
||||
DestroyWindow code. Also now marking the destroyed window itself
|
||||
as pending
|
||||
|
||||
2005-12-20 Jackson Harper <[email protected]>
|
||||
|
||||
* StatusBar.cs:
|
||||
* StatusBarPanel.cs: Don't calculate panel sizes on draw
|
||||
anymore. Just do them when needed, also track the rects of panels
|
||||
so that we can optimize refreshing more in the future.
|
||||
|
||||
2005-12-20 Alexander Olk <[email protected]>
|
||||
|
||||
* ColorDialog.cs: Fixed focus drawing in small color controls
|
||||
|
||||
2005-12-19 Jackson Harper <[email protected]>
|
||||
|
||||
* InternalWindowManager.cs:
|
||||
* MdiWindowManager.cs: Cleanup some coordinate system changes so
|
||||
moving windows works properly.
|
||||
|
||||
2005-12-19 Peter Dennis Bartok <[email protected]>
|
||||
|
||||
* Control.cs:
|
||||
- Removed call to InitLayout() from SetBoundsCore(); doc says
|
||||
it's only called when a control is added to a container
|
||||
- Split InitLayout logic, moved to separate UpdateDistances() method
|
||||
since we need to perform those calculations more often than just
|
||||
when adding the control to a container. (Needed to fix #77022)
|
||||
- Now calling UpdateDistances() from UpdateBounds() (fixes #77022)
|
||||
- Reduced the OnBindingContextChanged events count, don't send them
|
||||
unless the control is created, we still aren't totally matching
|
||||
MS, but I can't quite figure out some of their rules
|
||||
|
||||
2005-12-18 Alexander Olk <[email protected]>
|
||||
|
||||
* ThemeClearlooks.cs: Corrected distance between ProgressBar
|
||||
|
||||
@@ -29,7 +29,6 @@ using System.ComponentModel;
|
||||
using System.Drawing;
|
||||
using System.Globalization;
|
||||
using System.Resources;
|
||||
using System;
|
||||
|
||||
namespace System.Windows.Forms
|
||||
{
|
||||
@@ -1022,12 +1021,13 @@ namespace System.Windows.Forms
|
||||
private Color color;
|
||||
|
||||
private bool isSelected = false;
|
||||
private bool hasFocus = false;
|
||||
|
||||
public SmallColorControl( Color color )
|
||||
{
|
||||
this.color = color;
|
||||
|
||||
Size = new Size( 25, 23 );
|
||||
Size = new Size( 26, 23 );
|
||||
|
||||
SetStyle( ControlStyles.DoubleBuffer, true );
|
||||
SetStyle( ControlStyles.AllPaintingInWmPaint, true );
|
||||
@@ -1041,6 +1041,7 @@ namespace System.Windows.Forms
|
||||
{
|
||||
isSelected = value;
|
||||
Invalidate( );
|
||||
Update( );
|
||||
}
|
||||
|
||||
get
|
||||
@@ -1055,6 +1056,7 @@ namespace System.Windows.Forms
|
||||
{
|
||||
color = value;
|
||||
Invalidate( );
|
||||
Update( );
|
||||
}
|
||||
|
||||
get
|
||||
@@ -1069,18 +1071,21 @@ namespace System.Windows.Forms
|
||||
|
||||
pe.Graphics.FillRectangle( ThemeEngine.Current.ResPool.GetSolidBrush( BackColor ), 0, 0, 26, 23 );
|
||||
|
||||
pe.Graphics.FillRectangle( ThemeEngine.Current.ResPool.GetSolidBrush( color ),
|
||||
new Rectangle( 4, 4, 17, 15 ) );
|
||||
ControlPaint.DrawBorder3D( pe.Graphics, new Rectangle( 3, 3, 20, 18 ) );
|
||||
|
||||
DrawBorder( pe.Graphics, new Rectangle( 4, 4, 17, 15 ) );
|
||||
pe.Graphics.FillRectangle( ThemeEngine.Current.ResPool.GetSolidBrush( color ),
|
||||
new Rectangle( 4, 4, 16, 14 ) );
|
||||
|
||||
if ( isSelected )
|
||||
{
|
||||
pe.Graphics.DrawRectangle( ThemeEngine.Current.ResPool.GetPen( Color.Black ),
|
||||
new Rectangle( 2, 2, 20, 18 ) );
|
||||
using ( Pen pen = new Pen( ThemeEngine.Current.ResPool.GetSolidBrush( Color.Black ) ) )
|
||||
{
|
||||
pe.Graphics.DrawRectangle( pen,
|
||||
new Rectangle( 2, 2, 20, 18 ) );
|
||||
}
|
||||
}
|
||||
|
||||
if ( Focused )
|
||||
if ( hasFocus && isSelected )
|
||||
{
|
||||
ControlPaint.DrawFocusRectangle(
|
||||
pe.Graphics, new Rectangle( 0, 0, 25, 23 )
|
||||
@@ -1088,26 +1093,26 @@ namespace System.Windows.Forms
|
||||
}
|
||||
}
|
||||
|
||||
protected override void OnClick( EventArgs e ) {
|
||||
Focus();
|
||||
IsSelected = true;
|
||||
|
||||
base.OnClick( e );
|
||||
}
|
||||
|
||||
|
||||
protected override void OnLostFocus( EventArgs e )
|
||||
{
|
||||
hasFocus = false;
|
||||
|
||||
Invalidate( );
|
||||
Update( );
|
||||
|
||||
base.OnLostFocus( e );
|
||||
}
|
||||
|
||||
private void DrawBorder( Graphics dc, Rectangle rect )
|
||||
protected override void OnMouseUp( MouseEventArgs e )
|
||||
{
|
||||
Pen pen = ThemeEngine.Current.ResPool.GetPen( Color.Black );
|
||||
dc.DrawLine( pen, rect.X, rect.Y, rect.X, rect.Bottom - 1 );
|
||||
dc.DrawLine( pen, rect.X + 1, rect.Y, rect.Right - 1, rect.Y );
|
||||
isSelected = true;
|
||||
|
||||
hasFocus = true;
|
||||
|
||||
Invalidate( );
|
||||
Update( );
|
||||
|
||||
base.OnMouseUp( e );
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1118,6 +1123,8 @@ namespace System.Windows.Forms
|
||||
private Label userColorLabel;
|
||||
private Label baseColorLabel;
|
||||
|
||||
private bool panelSelected = false;
|
||||
|
||||
private SmallColorControl selectedSmallColorControl;
|
||||
|
||||
private int currentlyUsedUserSmallColorControl = 0;
|
||||
@@ -1548,6 +1555,8 @@ namespace System.Windows.Forms
|
||||
selectedSmallColorControl.IsSelected = true;
|
||||
|
||||
CheckIfColorIsInPanel( );
|
||||
|
||||
panelSelected = false;
|
||||
}
|
||||
|
||||
private void CheckIfColorIsInPanel( )
|
||||
@@ -1568,6 +1577,8 @@ namespace System.Windows.Forms
|
||||
|
||||
void OnSmallColorControlClick( object sender, EventArgs e )
|
||||
{
|
||||
panelSelected = true;
|
||||
|
||||
// previous selected smallcolorcontrol
|
||||
if ( selectedSmallColorControl != (SmallColorControl)sender )
|
||||
selectedSmallColorControl.IsSelected = false;
|
||||
@@ -1778,7 +1789,9 @@ namespace System.Windows.Forms
|
||||
|
||||
private void Draw( PaintEventArgs e )
|
||||
{
|
||||
e.Graphics.DrawImage( drawingBitmap.Bitmap, 0, 0 );
|
||||
Bitmap bmp = new Bitmap( drawingBitmap.Bitmap );
|
||||
|
||||
e.Graphics.DrawImage( bmp, 0, 0 );
|
||||
|
||||
// drawCross is false if the mouse gets moved...
|
||||
if ( drawCross )
|
||||
|
||||
@@ -1083,10 +1083,6 @@ namespace System.Windows.Forms
|
||||
|
||||
private int FindStringCaseInsensitive (string search)
|
||||
{
|
||||
if (search.Length == 0) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
for (int i = 0; i < Items.Count; i++)
|
||||
{
|
||||
if (String.Compare (GetItemText (Items[i]), 0, search, 0, search.Length, true) == 0)
|
||||
|
||||
@@ -141,11 +141,8 @@ namespace System.Windows.Forms
|
||||
ControlNativeWindow window;
|
||||
|
||||
window = (ControlNativeWindow)window_collection[hWnd];
|
||||
if (window != null) {
|
||||
return window.owner;
|
||||
}
|
||||
|
||||
return null;
|
||||
return window.owner;
|
||||
}
|
||||
|
||||
protected override void WndProc(ref Message m) {
|
||||
@@ -1215,19 +1212,10 @@ namespace System.Windows.Forms
|
||||
CreateControl();
|
||||
}
|
||||
|
||||
if ((binding_context == null) && Created) {
|
||||
if (binding_context == null) { // seem to be sent whenever it's null?
|
||||
OnBindingContextChanged(EventArgs.Empty);
|
||||
}
|
||||
}
|
||||
|
||||
private void UpdateDistances() {
|
||||
dist_left = bounds.X;
|
||||
dist_top = bounds.Y;
|
||||
if (parent != null) {
|
||||
dist_right = parent.ClientSize.Width - bounds.X - bounds.Width;
|
||||
dist_bottom = parent.ClientSize.Height - bounds.Y - bounds.Height;
|
||||
}
|
||||
}
|
||||
#endregion // Private & Internal Methods
|
||||
|
||||
#region Public Static Properties
|
||||
@@ -2358,7 +2346,6 @@ namespace System.Windows.Forms
|
||||
|
||||
[EditorBrowsable(EditorBrowsableState.Advanced)]
|
||||
public static Control FromHandle(IntPtr handle) {
|
||||
#if not
|
||||
IEnumerator control = Control.controls.GetEnumerator();
|
||||
|
||||
while (control.MoveNext()) {
|
||||
@@ -2367,11 +2354,7 @@ namespace System.Windows.Forms
|
||||
return ((Control)control.Current);
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
#else
|
||||
return Control.ControlNativeWindow.ControlFromHandle(handle);
|
||||
#endif
|
||||
}
|
||||
|
||||
public static bool IsMnemonic(char charCode, string text) {
|
||||
@@ -2443,9 +2426,6 @@ namespace System.Windows.Forms
|
||||
}
|
||||
|
||||
public void CreateControl() {
|
||||
if (is_created) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (!IsHandleCreated) {
|
||||
CreateHandle();
|
||||
@@ -3035,7 +3015,12 @@ namespace System.Windows.Forms
|
||||
|
||||
[EditorBrowsable(EditorBrowsableState.Advanced)]
|
||||
protected virtual void InitLayout() {
|
||||
UpdateDistances();
|
||||
dist_left = bounds.X;
|
||||
dist_top = bounds.Y;
|
||||
if (parent != null) {
|
||||
dist_right = parent.ClientSize.Width - bounds.X - bounds.Width;
|
||||
dist_bottom = parent.ClientSize.Height - bounds.Y - bounds.Height;
|
||||
}
|
||||
}
|
||||
|
||||
[EditorBrowsable(EditorBrowsableState.Advanced)]
|
||||
@@ -3386,6 +3371,12 @@ namespace System.Windows.Forms
|
||||
}
|
||||
|
||||
UpdateBounds(x, y, width, height);
|
||||
|
||||
//
|
||||
Control [] controls = child_controls.GetAllControls ();
|
||||
for (int i = controls.Length - 1; i >= 0; i--) {
|
||||
controls[i].InitLayout();
|
||||
}
|
||||
}
|
||||
|
||||
[EditorBrowsable(EditorBrowsableState.Advanced)]
|
||||
@@ -3527,8 +3518,6 @@ namespace System.Windows.Forms
|
||||
client_size.Width=width-client_x_diff;
|
||||
client_size.Height=height-client_y_diff;
|
||||
|
||||
UpdateDistances();
|
||||
|
||||
if (moved) {
|
||||
OnLocationChanged(EventArgs.Empty);
|
||||
}
|
||||
|
||||
@@ -57,7 +57,6 @@ namespace System.Windows.Forms {
|
||||
internal bool zero_sized;
|
||||
internal Rectangle invalid;
|
||||
internal bool expose_pending;
|
||||
internal bool destroy_pending;
|
||||
internal bool nc_expose_pending;
|
||||
internal bool configure_pending;
|
||||
internal bool reparented;
|
||||
@@ -84,7 +83,6 @@ namespace System.Windows.Forms {
|
||||
parent = null;
|
||||
invalid = Rectangle.Empty;
|
||||
expose_pending = false;
|
||||
destroy_pending = false;
|
||||
nc_expose_pending = false;
|
||||
reparented = false;
|
||||
client_rectangle = Rectangle.Empty;
|
||||
@@ -278,16 +276,6 @@ namespace System.Windows.Forms {
|
||||
}
|
||||
}
|
||||
|
||||
public bool DestroyPending {
|
||||
get {
|
||||
return destroy_pending;
|
||||
}
|
||||
|
||||
set {
|
||||
destroy_pending = value;
|
||||
}
|
||||
}
|
||||
|
||||
public bool ExposePending {
|
||||
get {
|
||||
return expose_pending;
|
||||
|
||||
@@ -46,10 +46,10 @@ namespace System.Windows.Forms {
|
||||
private TitleButton [] title_buttons = new TitleButton [3];
|
||||
|
||||
// moving windows
|
||||
internal Point start;
|
||||
private Point start;
|
||||
private State state;
|
||||
private FormPos sizing_edge;
|
||||
internal Rectangle virtual_position;
|
||||
private Rectangle virtual_position;
|
||||
private Rectangle prev_virtual_position;
|
||||
private Rectangle prev_bounds;
|
||||
private bool maximized;
|
||||
@@ -216,7 +216,11 @@ namespace System.Windows.Forms {
|
||||
int x = Control.LowOrder ((int) m.LParam.ToInt32 ());
|
||||
int y = Control.HighOrder ((int) m.LParam.ToInt32 ());
|
||||
|
||||
start = Cursor.Position;
|
||||
int client_x = x;
|
||||
int client_y = y;
|
||||
|
||||
PointToClient (ref client_x, ref client_y);
|
||||
start = new Point (client_x, client_y);
|
||||
virtual_position = form.Bounds;
|
||||
|
||||
form.PointToClient (ref x, ref y);
|
||||
@@ -337,8 +341,12 @@ namespace System.Windows.Forms {
|
||||
{
|
||||
Point move = MouseMove (m);
|
||||
|
||||
UpdateVP (virtual_position.X + move.X, virtual_position.Y + move.Y,
|
||||
virtual_position.Width, virtual_position.Height);
|
||||
virtual_position.X = start.X + move.X;
|
||||
virtual_position.Y = start.Y + move.Y;
|
||||
virtual_position.Width = form.Width;
|
||||
virtual_position.Height = form.Height;
|
||||
|
||||
DrawVirtualPosition (virtual_position);
|
||||
}
|
||||
|
||||
private void HandleSizing (Message m)
|
||||
@@ -418,17 +426,17 @@ namespace System.Windows.Forms {
|
||||
}
|
||||
}
|
||||
|
||||
protected void UpdateVP (Rectangle r)
|
||||
private void UpdateVP (Rectangle r)
|
||||
{
|
||||
UpdateVP (r.X, r.Y, r.Width, r.Height);
|
||||
}
|
||||
|
||||
protected void UpdateVP (Point loc, int w, int h)
|
||||
private void UpdateVP (Point loc, int w, int h)
|
||||
{
|
||||
UpdateVP (loc.X, loc.Y, w, h);
|
||||
}
|
||||
|
||||
protected void UpdateVP (int x, int y, int w, int h)
|
||||
private void UpdateVP (int x, int y, int w, int h)
|
||||
{
|
||||
virtual_position.X = x;
|
||||
virtual_position.Y = y;
|
||||
@@ -575,16 +583,23 @@ namespace System.Windows.Forms {
|
||||
}
|
||||
}
|
||||
|
||||
protected Point MouseMove (Message m)
|
||||
private Point MouseMove (Message m)
|
||||
{
|
||||
Point cp = Cursor.Position;
|
||||
return new Point (cp.X - start.X, cp.Y - start.Y);
|
||||
int x = Control.LowOrder ((int) m.LParam.ToInt32 ());
|
||||
int y = Control.HighOrder ((int) m.LParam.ToInt32 ());
|
||||
|
||||
form.PointToScreen (ref x, ref y);
|
||||
PointToClient (ref x, ref y);
|
||||
int x_move = x - start.X;
|
||||
int y_move = y - start.Y;
|
||||
|
||||
return new Point (x_move, y_move);
|
||||
}
|
||||
|
||||
protected virtual void DrawVirtualPosition (Rectangle virtual_position)
|
||||
{
|
||||
form.Location = virtual_position.Location;
|
||||
start = Cursor.Position;
|
||||
form.Bounds = virtual_position;
|
||||
start = form.Location;
|
||||
}
|
||||
|
||||
protected virtual void ClearVirtualPosition ()
|
||||
|
||||
@@ -92,17 +92,6 @@ namespace System.Windows.Forms {
|
||||
return false;
|
||||
}
|
||||
|
||||
protected override void HandleWindowMove (Message m)
|
||||
{
|
||||
Point move = MouseMove (m);
|
||||
|
||||
int x = virtual_position.X + move.X;
|
||||
int y = virtual_position.Y + move.Y;
|
||||
|
||||
UpdateVP (x, y, form.Width, form.Height);
|
||||
start = Cursor.Position;
|
||||
}
|
||||
|
||||
protected override void DrawVirtualPosition (Rectangle virtual_position)
|
||||
{
|
||||
ClearVirtualPosition ();
|
||||
@@ -110,6 +99,7 @@ namespace System.Windows.Forms {
|
||||
if (form.Parent != null)
|
||||
XplatUI.DrawReversibleRectangle (form.Parent.Handle, virtual_position, 2);
|
||||
prev_virtual_position = virtual_position;
|
||||
|
||||
}
|
||||
|
||||
protected override void ClearVirtualPosition ()
|
||||
|
||||
@@ -17,10 +17,10 @@
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
// Copyright (c) 2004-2005 Novell, Inc.
|
||||
// Copyright (c) 2004 Novell, Inc.
|
||||
//
|
||||
// Authors:
|
||||
// Peter Dennis Bartok [email protected]
|
||||
// Peter Bartok [email protected]
|
||||
//
|
||||
|
||||
|
||||
@@ -100,8 +100,8 @@ namespace System.Windows.Forms
|
||||
|
||||
public virtual void DestroyHandle() {
|
||||
if (window_handle != IntPtr.Zero) {
|
||||
XplatUI.DestroyWindow(window_handle);
|
||||
window_collection.Remove(window_handle);
|
||||
XplatUI.DestroyWindow(window_handle);
|
||||
window_handle=IntPtr.Zero;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -42,9 +42,6 @@ namespace System.Windows.Forms {
|
||||
#region Fields
|
||||
private StatusBarPanelCollection panels;
|
||||
|
||||
private Color back_color;
|
||||
private Color fore_color;
|
||||
|
||||
private bool show_panels = false;
|
||||
private bool sizing_grip = true;
|
||||
|
||||
@@ -55,8 +52,6 @@ namespace System.Windows.Forms {
|
||||
public StatusBar ()
|
||||
{
|
||||
base.Dock = DockStyle.Bottom;
|
||||
back_color = SystemColors.Control;
|
||||
fore_color = SystemColors.ControlText;
|
||||
Anchor = AnchorStyles.Top | AnchorStyles.Left;
|
||||
this.TabStop = false;
|
||||
this.SetStyle(ControlStyles.UserPaint | ControlStyles.Selectable, false);
|
||||
@@ -67,14 +62,14 @@ namespace System.Windows.Forms {
|
||||
[Browsable(false)]
|
||||
[EditorBrowsable(EditorBrowsableState.Never)]
|
||||
public override Color BackColor {
|
||||
get { return back_color; }
|
||||
get { return base.BackColor; }
|
||||
set {
|
||||
if (value == BackColor)
|
||||
return;
|
||||
back_color = value;
|
||||
base.BackColor = value;
|
||||
if (BackColorChanged != null)
|
||||
BackColorChanged (this, EventArgs.Empty);
|
||||
Update ();
|
||||
Refresh ();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -99,7 +94,7 @@ namespace System.Windows.Forms {
|
||||
if (value == Dock)
|
||||
return;
|
||||
base.Dock = value;
|
||||
Update ();
|
||||
Refresh ();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -110,21 +105,20 @@ namespace System.Windows.Forms {
|
||||
if (value == Font)
|
||||
return;
|
||||
base.Font = value;
|
||||
Update ();
|
||||
Refresh ();
|
||||
}
|
||||
}
|
||||
|
||||
[Browsable(false)]
|
||||
[EditorBrowsable(EditorBrowsableState.Never)]
|
||||
public override Color ForeColor {
|
||||
get { return fore_color; }
|
||||
get { return base.ForeColor; }
|
||||
set {
|
||||
if (value == ForeColor)
|
||||
return;
|
||||
fore_color = value;
|
||||
if (ForeColorChanged != null)
|
||||
ForeColorChanged (this, EventArgs.Empty);
|
||||
Update ();
|
||||
Refresh ();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -159,7 +153,6 @@ namespace System.Windows.Forms {
|
||||
if (show_panels == value)
|
||||
return;
|
||||
show_panels = value;
|
||||
Update ();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -170,7 +163,6 @@ namespace System.Windows.Forms {
|
||||
if (sizing_grip == value)
|
||||
return;
|
||||
sizing_grip = value;
|
||||
Update ();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -187,7 +179,7 @@ namespace System.Windows.Forms {
|
||||
if (value == Text)
|
||||
return;
|
||||
base.Text = value;
|
||||
Update ();
|
||||
Refresh ();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -236,7 +228,6 @@ namespace System.Windows.Forms {
|
||||
|
||||
protected override void OnHandleCreated (EventArgs e) {
|
||||
base.OnHandleCreated (e);
|
||||
CalcPanelSizes ();
|
||||
}
|
||||
|
||||
protected override void OnHandleDestroyed (EventArgs e) {
|
||||
@@ -278,7 +269,7 @@ namespace System.Windows.Forms {
|
||||
if (Width <= 0 || Height <= 0)
|
||||
return;
|
||||
|
||||
Update ();
|
||||
CalcPanelSizes ();
|
||||
}
|
||||
|
||||
protected override void WndProc(ref Message m) {
|
||||
@@ -304,37 +295,12 @@ namespace System.Windows.Forms {
|
||||
OnDrawItem (e);
|
||||
}
|
||||
|
||||
internal void UpdatePanel (StatusBarPanel panel)
|
||||
{
|
||||
if (panel.AutoSize == StatusBarPanelAutoSize.Contents) {
|
||||
Update ();
|
||||
return;
|
||||
}
|
||||
|
||||
Update ();
|
||||
}
|
||||
|
||||
internal void UpdatePanelContents (StatusBarPanel panel)
|
||||
{
|
||||
if (panel.AutoSize == StatusBarPanelAutoSize.Contents) {
|
||||
Update ();
|
||||
return;
|
||||
}
|
||||
|
||||
Update ();
|
||||
}
|
||||
|
||||
internal void Update ()
|
||||
{
|
||||
CalcPanelSizes ();
|
||||
Refresh ();
|
||||
}
|
||||
|
||||
private void DoPaint (PaintEventArgs pevent)
|
||||
{
|
||||
if (Width <= 0 || Height <= 0 || Visible == false)
|
||||
return;
|
||||
|
||||
CalcPanelSizes ();
|
||||
Draw (pevent.Graphics, pevent.ClipRectangle);
|
||||
}
|
||||
|
||||
@@ -346,15 +312,11 @@ namespace System.Windows.Forms {
|
||||
if (Width == 0 || Height == 0)
|
||||
return;
|
||||
|
||||
int border = 2;
|
||||
int gap = ThemeEngine.Current.StatusBarHorzGapWidth;
|
||||
int taken = 0;
|
||||
ArrayList springs = null;
|
||||
|
||||
taken = border;
|
||||
for (int i = 0; i < panels.Count; i++) {
|
||||
StatusBarPanel p = panels [i];
|
||||
|
||||
if (p.AutoSize == StatusBarPanelAutoSize.None) {
|
||||
taken += p.Width;
|
||||
taken += gap;
|
||||
@@ -362,7 +324,7 @@ namespace System.Windows.Forms {
|
||||
}
|
||||
if (p.AutoSize == StatusBarPanelAutoSize.Contents) {
|
||||
int len = (int) (DeviceContext.MeasureString (p.Text, Font).Width + 0.5F);
|
||||
p.SetWidth (len + 8);
|
||||
p.Width = (int) (len + 8);
|
||||
taken += p.Width;
|
||||
taken += gap;
|
||||
continue;
|
||||
@@ -384,14 +346,7 @@ namespace System.Windows.Forms {
|
||||
for (int i = 0; i < spring_total; i++) {
|
||||
StatusBarPanel p = (StatusBarPanel) springs [i];
|
||||
int width = total_width / spring_total;
|
||||
p.SetWidth (width >= p.MinWidth ? width : p.MinWidth);
|
||||
}
|
||||
|
||||
taken = border;
|
||||
for (int i = 0; i < panels.Count; i++) {
|
||||
StatusBarPanel p = panels [i];
|
||||
p.X = taken;
|
||||
taken += p.Width + gap;
|
||||
p.Width = (width >= p.MinWidth ? width : p.MinWidth);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -49,7 +49,6 @@ namespace System.Windows.Forms {
|
||||
private int width = 100;
|
||||
private int twidth = -1;
|
||||
private int min_width = 10;
|
||||
internal int X;
|
||||
#endregion // Local Variables
|
||||
|
||||
#region Constructors
|
||||
@@ -64,7 +63,7 @@ namespace System.Windows.Forms {
|
||||
get { return alignment; }
|
||||
set {
|
||||
alignment = value;
|
||||
InvalidateContents ();
|
||||
Invalidate ();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -93,7 +92,7 @@ namespace System.Windows.Forms {
|
||||
get { return icon; }
|
||||
set {
|
||||
icon = value;
|
||||
InvalidateContents ();
|
||||
Invalidate ();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -146,7 +145,7 @@ namespace System.Windows.Forms {
|
||||
get { return text; }
|
||||
set {
|
||||
text = value;
|
||||
InvalidateContents ();
|
||||
Invalidate ();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -162,18 +161,12 @@ namespace System.Windows.Forms {
|
||||
get { return parent; }
|
||||
}
|
||||
|
||||
private void Invalidate ()
|
||||
void Invalidate ()
|
||||
{
|
||||
if (parent == null)
|
||||
return;
|
||||
parent.UpdatePanel (this);
|
||||
}
|
||||
|
||||
private void InvalidateContents ()
|
||||
{
|
||||
if (parent == null)
|
||||
return;
|
||||
parent.UpdatePanelContents (this);
|
||||
parent.Refresh ();
|
||||
}
|
||||
|
||||
internal void SetParent (StatusBar parent)
|
||||
@@ -181,11 +174,6 @@ namespace System.Windows.Forms {
|
||||
this.parent = parent;
|
||||
}
|
||||
|
||||
internal void SetWidth (int width)
|
||||
{
|
||||
this.width = width;
|
||||
}
|
||||
|
||||
public override string ToString ()
|
||||
{
|
||||
return "StatusBarPanel: {" + Text +"}";
|
||||
|
||||
@@ -452,7 +452,7 @@ namespace System.Windows.Forms {
|
||||
}
|
||||
|
||||
if (doc.wrap) {
|
||||
if ((wrap_pos > 0) && (wrap_pos != len) && (widths[pos] + w) + 27 > (doc.viewport_width - this.right_indent)) {
|
||||
if ((widths[pos] + w) + 27 > (doc.viewport_width - this.right_indent)) {
|
||||
pos = wrap_pos;
|
||||
tag.width = wrap_width;
|
||||
doc.Split(this, tag, pos, true);
|
||||
|
||||
@@ -3178,7 +3178,7 @@ namespace System.Windows.Forms
|
||||
Border3DStyle border_style = Border3DStyle.SunkenInner;
|
||||
if (panel.BorderStyle == StatusBarPanelBorderStyle.Raised)
|
||||
border_style = Border3DStyle.RaisedOuter;
|
||||
CPDrawBorder3D(dc, area, border_style, Border3DSide.All, panel.Parent.BackColor);
|
||||
CPDrawBorder3D(dc, area, border_style, Border3DSide.All, ColorControl);
|
||||
}
|
||||
|
||||
if (panel.Style == StatusBarPanelStyle.OwnerDraw) {
|
||||
|
||||
@@ -334,10 +334,10 @@ namespace System.Windows.Forms {
|
||||
internal int tmOverhang;
|
||||
internal int tmDigitizedAspectX;
|
||||
internal int tmDigitizedAspectY;
|
||||
internal short tmFirstChar;
|
||||
internal short tmLastChar;
|
||||
internal short tmDefaultChar;
|
||||
internal short tmBreakChar;
|
||||
internal byte tmFirstChar;
|
||||
internal byte tmLastChar;
|
||||
internal byte tmDefaultChar;
|
||||
internal byte tmBreakChar;
|
||||
internal byte tmItalic;
|
||||
internal byte tmUnderlined;
|
||||
internal byte tmStruckOut;
|
||||
|
||||
@@ -162,6 +162,7 @@ namespace System.Windows.Forms {
|
||||
static readonly object lockobj = new object ();
|
||||
|
||||
#endregion // Local Variables
|
||||
|
||||
#region Constructors
|
||||
private XplatUIX11() {
|
||||
// Handle singleton stuff first
|
||||
@@ -1229,25 +1230,6 @@ namespace System.Windows.Forms {
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
private void DestroyChildWindow(IntPtr handle) {
|
||||
Hwnd hwnd;
|
||||
int i;
|
||||
Control c;
|
||||
ArrayList handles;
|
||||
|
||||
c = Control.ControlNativeWindow.ControlFromHandle(handle);
|
||||
if (c != null) for (i = 0; i < c.Controls.Count; i++) {
|
||||
hwnd = Hwnd.ObjectFromHandle(c.Controls[i].Handle);
|
||||
if (hwnd != null) {
|
||||
hwnd.destroy_pending = true;
|
||||
}
|
||||
if (c.Controls[i].Controls.Count > 0) {
|
||||
DestroyChildWindow(c.Controls[i].Handle);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#endregion // Private Methods
|
||||
|
||||
#region Callbacks
|
||||
@@ -1581,12 +1563,8 @@ namespace System.Windows.Forms {
|
||||
|
||||
|
||||
internal override void Activate(IntPtr handle) {
|
||||
Hwnd hwnd;
|
||||
|
||||
hwnd = Hwnd.ObjectFromHandle(handle);
|
||||
|
||||
if (hwnd != null) lock (XlibLock) {
|
||||
SendNetWMMessage(hwnd.whole_window, (IntPtr)NetAtoms[(int)NA._NET_ACTIVE_WINDOW], IntPtr.Zero, IntPtr.Zero, IntPtr.Zero);
|
||||
lock (XlibLock) {
|
||||
SendNetWMMessage(Hwnd.ObjectFromHandle(handle).whole_window, (IntPtr)NetAtoms[(int)NA._NET_ACTIVE_WINDOW], IntPtr.Zero, IntPtr.Zero, IntPtr.Zero);
|
||||
//XRaiseWindow(DisplayHandle, handle);
|
||||
}
|
||||
return;
|
||||
@@ -2197,12 +2175,6 @@ namespace System.Windows.Forms {
|
||||
DestroyCaret(handle);
|
||||
}
|
||||
|
||||
// The window is a goner, don't send it stuff like WM_PAINT anymore
|
||||
hwnd.destroy_pending = true;
|
||||
|
||||
// Mark our children as gone as well
|
||||
DestroyChildWindow(handle);
|
||||
|
||||
lock (XlibLock) {
|
||||
if (hwnd.client_window != IntPtr.Zero) {
|
||||
XDestroyWindow(DisplayHandle, hwnd.client_window);
|
||||
@@ -2443,15 +2415,12 @@ namespace System.Windows.Forms {
|
||||
|
||||
hwnd = Hwnd.GetObjectFromWindow(xevent.AnyEvent.window);
|
||||
|
||||
// Handle messages for windows that are already or are about to be destroyed
|
||||
if (hwnd == null || hwnd.destroy_pending) {
|
||||
// We need to let the DestroyNotify go through so that the owning control can learn about it, too
|
||||
if (hwnd == null || xevent.type != XEventName.DestroyNotify) {
|
||||
#if DriverDebug
|
||||
Console.WriteLine("GetMessage(): Got message {0} for non-existent or already destroyed window {1:X}", xevent.type, xevent.AnyEvent.window.ToInt32());
|
||||
#endif
|
||||
goto ProcessNextMessage;
|
||||
}
|
||||
// Handle messages for windows that are already destroyed
|
||||
if (hwnd == null) {
|
||||
#if DriverDebug
|
||||
Console.WriteLine("GetMessage(): Got message {0} for non-existent window {1:X}", xevent.type, xevent.AnyEvent.window.ToInt32());
|
||||
#endif
|
||||
goto ProcessNextMessage;
|
||||
}
|
||||
|
||||
if (hwnd.client_window == xevent.AnyEvent.window) {
|
||||
|
||||
@@ -56,7 +56,6 @@ namespace Microsoft.JScript {
|
||||
|
||||
internal AST left {
|
||||
get { return operand1; }
|
||||
set { operand1 = value; }
|
||||
}
|
||||
|
||||
internal AST right {
|
||||
|
||||
@@ -1,14 +1,3 @@
|
||||
2005-12-15 Cesar Lopez Nataren <[email protected]>
|
||||
|
||||
* Parser.cs: Use the new assign ctr and Init method.
|
||||
* expression.cs (Assign): Modify the number of ctr and added the Init method.
|
||||
* BinaryOp.cs: Add setter for left.
|
||||
|
||||
* Statement.cs (For.Emit): Take into account what relational
|
||||
operator is in place.
|
||||
|
||||
* expression.cs (Assign.Emit): Emit box in the op= cases.
|
||||
|
||||
2005-12-10 Florian Gross <[email protected]> and
|
||||
Evan Briones <[email protected]>
|
||||
|
||||
|
||||
@@ -372,9 +372,7 @@ namespace Microsoft.JScript {
|
||||
} else {
|
||||
// FIXME
|
||||
pn = fn;
|
||||
Assign assign = new Assign (null, JSToken.Assign, new Location (ts.SourceName, ts.LineNumber));
|
||||
assign.Init (member_expr, pn, false);
|
||||
pn = assign;
|
||||
pn = new Assign (null, member_expr, pn, JSToken.Assign, false, new Location (ts.SourceName, ts.LineNumber));
|
||||
|
||||
// FIXME, research about createExprStatement
|
||||
if (ft != FunctionType.Expression)
|
||||
@@ -877,17 +875,14 @@ namespace Microsoft.JScript {
|
||||
if (tt == Token.ASSIGN) {
|
||||
ts.GetToken ();
|
||||
decompiler.AddToken (Token.ASSIGN);
|
||||
Assign assign = new Assign (parent, JSToken.Assign, new Location (ts.SourceName, ts.LineNumber));
|
||||
assign.Init (pn, AssignExpr (assign, in_for_init), false);
|
||||
pn = assign;
|
||||
pn = new Assign (parent, pn, AssignExpr (parent, in_for_init), JSToken.Assign, false, new Location (ts.SourceName, ts.LineNumber));
|
||||
return pn;
|
||||
} else if (tt == Token.ASSIGNOP) {
|
||||
ts.GetToken ();
|
||||
int op = ts.GetOp ();
|
||||
decompiler.AddAssignOp (op);
|
||||
Assign assign = new Assign (parent, ToJSToken (op, tt), new Location (ts.SourceName, ts.LineNumber));
|
||||
assign.Init (pn, AssignExpr (assign, in_for_init), false);
|
||||
pn = assign;
|
||||
pn = new Assign (parent, pn, AssignExpr (parent, in_for_init), ToJSToken (op, tt), false,
|
||||
new Location (ts.SourceName, ts.LineNumber));
|
||||
}
|
||||
return pn;
|
||||
}
|
||||
|
||||
@@ -508,14 +508,9 @@ namespace Microsoft.JScript {
|
||||
if (a is Equality)
|
||||
ig.Emit (OpCodes.Brfalse, forward);
|
||||
else if (a is Relational) {
|
||||
Relational rel = (Relational) a;
|
||||
ig.Emit (OpCodes.Ldc_I4_0);
|
||||
ig.Emit (OpCodes.Conv_R8);
|
||||
|
||||
if (rel.op == JSToken.GreaterThan)
|
||||
ig.Emit (OpCodes.Ble, forward);
|
||||
else
|
||||
ig.Emit (OpCodes.Bge, forward);
|
||||
ig.Emit (OpCodes.Bge, forward);
|
||||
}
|
||||
}
|
||||
/* emit stms */
|
||||
|
||||
@@ -1998,15 +1998,9 @@ namespace Microsoft.JScript {
|
||||
|
||||
internal bool is_embedded;
|
||||
|
||||
internal Assign (AST parent, JSToken op, Location location)
|
||||
: base (parent, null, null, op, location)
|
||||
internal Assign (AST parent, AST left, AST right, JSToken op, bool is_embedded, Location location)
|
||||
: base (parent, left, right, op, location)
|
||||
{
|
||||
}
|
||||
|
||||
internal void Init (AST left, AST right, bool is_embedded)
|
||||
{
|
||||
this.left = left;
|
||||
this.right = right;
|
||||
this.is_embedded = is_embedded;
|
||||
}
|
||||
|
||||
@@ -2107,10 +2101,8 @@ namespace Microsoft.JScript {
|
||||
ig.Emit (OpCodes.Ldloc, local);
|
||||
ig.Emit (OpCodes.Ldloc, aux);
|
||||
|
||||
if (right != null) {
|
||||
if (right != null)
|
||||
right.Emit (ec);
|
||||
CodeGenerator.EmitBox (ig, right);
|
||||
}
|
||||
|
||||
emit_evaluation (op, type, ig);
|
||||
|
||||
|
||||
@@ -1,40 +1,3 @@
|
||||
2005-12-21 Cesar Lopez Nataren <[email protected]>
|
||||
|
||||
* mjs-most.tests: Enable js1_2/Array/tostring_1.js,
|
||||
js1_2/regexp/alphanumeric.js, js1_2/regexp/digit.js,
|
||||
js1_2/regexp/whitespace.js and js1_2/regexp/word_boundary.js.
|
||||
|
||||
* mjs-most.tests: Enable ecma_2/Expressions/instanceof-002.js.
|
||||
|
||||
2005-12-20 Cesar Lopez Nataren <[email protected]>
|
||||
|
||||
* mjs-most.tests:Enable ecma/Boolean/15.6.3.1-1.js,
|
||||
ecma/FunctionObjects/15.3.4.js, ecma/GlobalObject/15.1.2.5-2.js,
|
||||
ecma/Statements/12.6.2-8.js
|
||||
|
||||
2005-12-17 Cesar Lopez Nataren <[email protected]>
|
||||
|
||||
* mjs-most.fail: Erase js1_3/inherit/proto_6.js,
|
||||
js1_3/inherit/proto_7.js, js1_3/inherit/proto_8.js,
|
||||
ecma/FunctionObjects/15.3.4-1.js, ecma_2/Exceptions/global-001.js,
|
||||
ecma_2/Statements/dowhile-006.js,
|
||||
ecma/ObjectObjects/15.2.3.1-2.js, js1_4/Regress/function-003.js as
|
||||
they fail no more.
|
||||
|
||||
2005-12-16 Cesar Lopez Nataren <[email protected]>
|
||||
|
||||
* mjs-most-tests: Enable ecma/Expressions/11.13.1.js and
|
||||
ecma/TypeConversion/9.3.1-3.js.
|
||||
|
||||
* mjs-most-tests: Enable ecma_2/Statements/dowhile-003.js.
|
||||
|
||||
2005-12-15 Cesar Lopez Nataren <[email protected]>
|
||||
|
||||
* mjs-most.tests: Enable js1_3/inherit/proto_11.js and
|
||||
js1_3/inherit/proto_12.js.
|
||||
|
||||
* mjs-most.tests: Enable ecma/Date/15.9.1.1-2.js.
|
||||
|
||||
2005-12-10 Cesar Lopez Nataren <[email protected]>
|
||||
|
||||
* runner.cs: Make the current direcory the place where we create
|
||||
|
||||
@@ -17,7 +17,9 @@ ecma_2/Exceptions/date-001.js
|
||||
ecma_2/Statements/try-003.js
|
||||
ecma_2/Statements/try-004.js
|
||||
ecma_2/Statements/try-012.js
|
||||
|
||||
js1_3/inherit/proto_6.js
|
||||
js1_3/inherit/proto_7.js
|
||||
js1_3/inherit/proto_8.js
|
||||
|
||||
# System.NotImplementedException: Should emit LateBinding.CallValue logic for unknown constructor Math
|
||||
ecma/Expressions/11.2.2-10-n.js
|
||||
@@ -55,9 +57,20 @@ ecma/Statements/12.6.3-19.js
|
||||
# System.NotImplementedException: The requested feature is not implemented. (Convert:ToForInObject)
|
||||
ecma/String/15.5.5.1.js
|
||||
|
||||
# System.NotImplementedException: The requested feature is not implemented.
|
||||
# (Call:Emit, member_type = Property, member_exp = Function AccessField prototype)
|
||||
ecma/FunctionObjects/15.3.4-1.js
|
||||
|
||||
# System.Exception: error JS5002 A: function expected.
|
||||
ecma_2/Exceptions/exception-001.js
|
||||
|
||||
# System.NotImplementedException: The requested feature is not implemented.
|
||||
# (Convert:ToPrimitive, value = System.Object[])
|
||||
ecma_2/Exceptions/global-001.js
|
||||
|
||||
# System.Exception: uknown type: Microsoft.JScript.Call
|
||||
# (fall_false, last_exp.GetType () == looping Microsoft.JScript.Args)
|
||||
ecma_2/Statements/dowhile-006.js
|
||||
# System.Exception: uknown type: Microsoft.JScript.Assign
|
||||
# (fall_false, last_exp.GetType () == expression Assign object AccessField whileExpression)
|
||||
ecma_2/Statements/while-002.js
|
||||
@@ -85,4 +98,8 @@ ecma/Array/15.4.3.1-2.js
|
||||
ecma/FunctionObjects/15.3.3.1-3.js
|
||||
ecma/Number/15.7.3.3-2.js
|
||||
ecma/Number/15.7.3.5-2.jsc
|
||||
ecma/ObjectObjects/15.2.3.1-2.js
|
||||
ecma/Number/15.7.3.5-2.js
|
||||
|
||||
# runtime error
|
||||
js1_4/Regress/function-003.js
|
||||
@@ -63,7 +63,8 @@ ecma/Array/15.4.5.1-2.js
|
||||
#ecma/Array/15.4.5.2-2.js
|
||||
ecma/Boolean/15.6.1.js
|
||||
ecma/Boolean/15.6.2.js
|
||||
ecma/Boolean/15.6.3.1-1.js
|
||||
# ToForInObject
|
||||
#ecma/Boolean/15.6.3.1-1.js
|
||||
ecma/Boolean/15.6.3.1-2.js
|
||||
# invalid IL
|
||||
#ecma/Boolean/15.6.3.1-3.js
|
||||
@@ -79,17 +80,18 @@ ecma/Boolean/15.6.4.1.js
|
||||
#ecma/Boolean/15.6.4.2-1.js
|
||||
ecma/Boolean/15.6.4.2-2.js
|
||||
ecma/Boolean/15.6.4.2-3.js
|
||||
# Invoked Boolean.prototype.toString or Boolean.prototype.valueOf method on non-boolean
|
||||
# Needs eval
|
||||
#ecma/Boolean/15.6.4.2-4-n.js
|
||||
ecma/Boolean/15.6.4.3-1.js
|
||||
ecma/Boolean/15.6.4.3-2.js
|
||||
ecma/Boolean/15.6.4.3-3.js
|
||||
# Invoked Boolean.prototype.toString or Boolean.prototype.valueOf method on non-boolean
|
||||
# Needs eval
|
||||
#ecma/Boolean/15.6.4.3-4-n.js
|
||||
ecma/Boolean/15.6.4.3.js
|
||||
ecma/Boolean/15.6.4.js
|
||||
ecma/Date/15.9.1.1-1.js
|
||||
ecma/Date/15.9.1.1-2.js
|
||||
# Invalid IL
|
||||
#ecma/Date/15.9.1.1-2.js
|
||||
ecma/Date/15.9.2.1.js
|
||||
ecma/Date/15.9.2.2-1.js
|
||||
ecma/Date/15.9.2.2-2.js
|
||||
@@ -114,10 +116,11 @@ ecma/Date/15.9.3.8-4.js
|
||||
ecma/Date/15.9.3.8-5.js
|
||||
ecma/Date/15.9.4.2-1.js
|
||||
ecma/Date/15.9.4.2.js
|
||||
# invalid IL
|
||||
# for blocks seem to be disconnected from their parent scopes and this file needs that
|
||||
# to work
|
||||
#ecma/Date/15.9.4.3.js
|
||||
ecma/Date/15.9.5.1.js
|
||||
# Trace/breakpoint trap
|
||||
# Invalid IL
|
||||
#ecma/Date/15.9.5.10-1.js
|
||||
#ecma/Date/15.9.5.10-10.js
|
||||
#ecma/Date/15.9.5.10-11.js
|
||||
@@ -138,9 +141,7 @@ ecma/Date/15.9.5.1.js
|
||||
#ecma/Date/15.9.5.11-6.js
|
||||
#ecma/Date/15.9.5.11-7.js
|
||||
#ecma/Date/15.9.5.12-1.js
|
||||
# Invalid IL
|
||||
#ecma/Date/15.9.5.12-2.js
|
||||
# Trace/breakpoint trap
|
||||
#ecma/Date/15.9.5.12-3.js
|
||||
#ecma/Date/15.9.5.12-4.js
|
||||
#ecma/Date/15.9.5.12-5.js
|
||||
@@ -191,13 +192,15 @@ ecma/Date/15.9.5.22-8.js
|
||||
#ecma/Date/15.9.5.23-13.js
|
||||
#ecma/Date/15.9.5.23-14.js
|
||||
ecma/Date/15.9.5.23-15.js
|
||||
# Trace/breakpoint trap
|
||||
# Invalid IL
|
||||
#ecma/Date/15.9.5.23-16.js
|
||||
# Invalid IL
|
||||
#ecma/Date/15.9.5.23-17.js
|
||||
#ecma/Date/15.9.5.23-18.js
|
||||
#ecma/Date/15.9.5.23-2.js
|
||||
# System.Exception: Type error throw by DatePrototype:setTime
|
||||
# Needs eval
|
||||
#ecma/Date/15.9.5.23-3-n.js
|
||||
# Invalid IL
|
||||
#ecma/Date/15.9.5.23-4.js
|
||||
#ecma/Date/15.9.5.23-5.js
|
||||
#ecma/Date/15.9.5.23-6.js
|
||||
@@ -207,11 +210,13 @@ ecma/Date/15.9.5.23-15.js
|
||||
#ecma/Date/15.9.5.24-1.js
|
||||
#ecma/Date/15.9.5.24-2.js
|
||||
ecma/Date/15.9.5.24-3.js
|
||||
# Trace/breakpoint trap
|
||||
# Invalid IL
|
||||
#ecma/Date/15.9.5.24-4.js
|
||||
ecma/Date/15.9.5.25-1.js
|
||||
# Invalid IL
|
||||
#ecma/Date/15.9.5.26-1.js
|
||||
ecma/Date/15.9.5.27-1.js
|
||||
# Invalid IL
|
||||
#ecma/Date/15.9.5.28-1.js
|
||||
ecma/Date/15.9.5.29-1.js
|
||||
ecma/Date/15.9.5.3-1-n.js
|
||||
@@ -219,7 +224,7 @@ ecma/Date/15.9.5.3-2.js
|
||||
# Invalid IL
|
||||
#ecma/Date/15.9.5.30-1.js
|
||||
ecma/Date/15.9.5.31-1.js
|
||||
# Trace/breakpoint trap
|
||||
# Invalid IL
|
||||
#ecma/Date/15.9.5.32-1.js
|
||||
#ecma/Date/15.9.5.33-1.js
|
||||
#ecma/Date/15.9.5.34-1.js
|
||||
@@ -237,9 +242,9 @@ ecma/Date/15.9.5.31-1.js
|
||||
#ecma/Date/15.9.5.37-4.js
|
||||
#ecma/Date/15.9.5.37-5.js
|
||||
ecma/Date/15.9.5.4-1.js
|
||||
# System.Exception: Type error thrown by DatePrototype:getTime
|
||||
# Needs eval
|
||||
#ecma/Date/15.9.5.4-2-n.js
|
||||
# Trace/breakpoint trap
|
||||
# Invalid IL
|
||||
#ecma/Date/15.9.5.5.js
|
||||
#ecma/Date/15.9.5.6.js
|
||||
ecma/Date/15.9.5.7.js
|
||||
@@ -258,7 +263,7 @@ ecma/ExecutionContexts/10.1.4-10.js
|
||||
#ecma/ExecutionContexts/10.1.4-4.js
|
||||
#ecma/ExecutionContexts/10.1.4-5.js
|
||||
#ecma/ExecutionContexts/10.1.4-6.js
|
||||
# NotImplementedException thrown by Unary:Emit
|
||||
# Needs with
|
||||
#ecma/ExecutionContexts/10.1.4-7.js
|
||||
# Invalid IL
|
||||
#ecma/ExecutionContexts/10.1.4-8.js
|
||||
@@ -279,24 +284,23 @@ ecma/ExecutionContexts/10.1.4-10.js
|
||||
# Needs for in loops
|
||||
#ecma/ExecutionContexts/10.2.1.js
|
||||
#ecma/ExecutionContexts/10.2.2-1.js
|
||||
# needs with
|
||||
# Needs eval
|
||||
#ecma/ExecutionContexts/10.2.2-2.js
|
||||
ecma/ExecutionContexts/10.2.3-1.js
|
||||
# NotImplementedException thrown by Unary:Emit
|
||||
#ecma/ExecutionContexts/10.2.3-2.js
|
||||
# syntax error
|
||||
# Needs eval
|
||||
#ecma/Expressions/11.1.1.js
|
||||
# Invalid IL
|
||||
#ecma/Expressions/11.10-1.js
|
||||
#ecma/Expressions/11.10-2.js
|
||||
#ecma/Expressions/11.10-3.js
|
||||
#ecma/Expressions/11.12-1.js
|
||||
# syntax error
|
||||
# Needs eval
|
||||
#ecma/Expressions/11.12-2-n.js
|
||||
ecma/Expressions/11.12-3.js
|
||||
# Invalid IL
|
||||
#ecma/Expressions/11.12-4.js
|
||||
ecma/Expressions/11.13.1.js
|
||||
#ecma/Expressions/11.13.1.js
|
||||
#ecma/Expressions/11.13.2-1.js
|
||||
#ecma/Expressions/11.13.2-2.js
|
||||
#ecma/Expressions/11.13.2-3.js
|
||||
@@ -304,19 +308,17 @@ ecma/Expressions/11.13.1.js
|
||||
#ecma/Expressions/11.13.2-5.js
|
||||
#ecma/Expressions/11.13.js
|
||||
#ecma/Expressions/11.14-1.js
|
||||
# needs eval
|
||||
#ecma/Expressions/11.2.1-1.js
|
||||
#ecma/Expressions/11.2.1-2.js
|
||||
ecma/Expressions/11.2.1-3-n.js
|
||||
ecma/Expressions/11.2.1-4-n.js
|
||||
#ecma/Expressions/11.2.1-5.js
|
||||
# invalid IL
|
||||
#ecma/Expressions/11.2.2-1-n.js
|
||||
ecma/Expressions/11.2.2-1.js
|
||||
ecma/Expressions/11.2.2-10-n.js
|
||||
# Needs new Function
|
||||
#ecma/Expressions/11.2.2-11.js
|
||||
# arguments failures
|
||||
# Invalid IL
|
||||
#ecma/Expressions/11.2.2-2-n.js
|
||||
#ecma/Expressions/11.2.2-3-n.js
|
||||
#ecma/Expressions/11.2.2-4-n.js
|
||||
@@ -332,7 +334,7 @@ ecma/Expressions/11.2.3-4-n.js
|
||||
ecma/Expressions/11.2.3-5.js
|
||||
ecma/Expressions/11.3.1.js
|
||||
ecma/Expressions/11.3.2.js
|
||||
# syntax error
|
||||
# Needs eval
|
||||
#ecma/Expressions/11.4.1.js
|
||||
ecma/Expressions/11.4.2.js
|
||||
# NotImplementedException from Binary:emit_access
|
||||
@@ -342,7 +344,7 @@ ecma/Expressions/11.4.5.js
|
||||
ecma/Expressions/11.4.6.js
|
||||
# NullReferenceException from Binary:emit_access
|
||||
#ecma/Expressions/11.4.8.js
|
||||
# syntax error
|
||||
# System.Exception: must create expr stm with
|
||||
#ecma/Expressions/11.4.9.js
|
||||
ecma/Expressions/11.5.1.js
|
||||
ecma/Expressions/11.5.2.js
|
||||
@@ -366,32 +368,33 @@ ecma/Expressions/11.6.3.js
|
||||
#ecma/Expressions/11.9.2.js
|
||||
#ecma/Expressions/11.9.3.js
|
||||
#ecma/FunctionObjects/15.3.1.1-1.js
|
||||
# Needs new Function
|
||||
#ecma/FunctionObjects/15.3.1.1-2.js
|
||||
# syntax error
|
||||
# Needs eval
|
||||
#ecma/FunctionObjects/15.3.1.1-3.js
|
||||
# Needs FunctionConstructor:CreateInstance
|
||||
#ecma/FunctionObjects/15.3.2.1-1.js
|
||||
# Needs new Function
|
||||
#ecma/FunctionObjects/15.3.2.1-2.js
|
||||
# syntax error
|
||||
# Needs eval
|
||||
#ecma/FunctionObjects/15.3.2.1-3.js
|
||||
ecma/FunctionObjects/15.3.3.1-1.js
|
||||
# Needs for in
|
||||
#ecma/FunctionObjects/15.3.3.1-2.js
|
||||
ecma/FunctionObjects/15.3.3.1-3.js
|
||||
# invalid IL
|
||||
#ecma/FunctionObjects/15.3.3.1-4.js
|
||||
ecma/FunctionObjects/15.3.3.2.js
|
||||
ecma/FunctionObjects/15.3.4-1.js
|
||||
ecma/FunctionObjects/15.3.4.1.js
|
||||
ecma/FunctionObjects/15.3.4.js
|
||||
# syntax error
|
||||
# Needs new Function
|
||||
#ecma/FunctionObjects/15.3.4.js
|
||||
# Needs eval
|
||||
#ecma/FunctionObjects/15.3.5-1.js
|
||||
# Needs new Function
|
||||
#ecma/FunctionObjects/15.3.5-2.js
|
||||
#ecma/FunctionObjects/15.3.5.1.js
|
||||
#ecma/FunctionObjects/15.3.5.3.js
|
||||
# syntax error
|
||||
# Needs eval
|
||||
#ecma/GlobalObject/15.1-1-n.js
|
||||
#ecma/GlobalObject/15.1-2-n.js
|
||||
ecma/GlobalObject/15.1.1.1.js
|
||||
@@ -409,13 +412,14 @@ ecma/GlobalObject/15.1.2.3-2.js
|
||||
# NullReferenceException from SemanticAnalyser:contains
|
||||
#ecma/GlobalObject/15.1.2.4.js
|
||||
#ecma/GlobalObject/15.1.2.5-1.js
|
||||
ecma/GlobalObject/15.1.2.5-2.js
|
||||
# NullReferenceException from Binary:emit_access
|
||||
#ecma/GlobalObject/15.1.2.5-2.js
|
||||
# NullReferenceException from For:Resolve
|
||||
#ecma/GlobalObject/15.1.2.5-3.js
|
||||
# NullReferenceException from SemanticAnalyser:contains
|
||||
#ecma/GlobalObject/15.1.2.6.js
|
||||
#ecma/GlobalObject/15.1.2.7.js
|
||||
# syntax error
|
||||
# Needs eval
|
||||
#ecma/LexicalConventions/7.1-1.js
|
||||
#ecma/LexicalConventions/7.1-2.js
|
||||
#ecma/LexicalConventions/7.1-3.js
|
||||
@@ -431,7 +435,7 @@ ecma/LexicalConventions/7.2-6.js
|
||||
#ecma/LexicalConventions/7.3-10.js
|
||||
#ecma/LexicalConventions/7.3-11.js
|
||||
#ecma/LexicalConventions/7.3-12.js
|
||||
# syntax error
|
||||
# Needs eval
|
||||
#ecma/LexicalConventions/7.3-13-n.js
|
||||
# Invalid IL
|
||||
#ecma/LexicalConventions/7.3-2.js
|
||||
@@ -442,8 +446,8 @@ ecma/LexicalConventions/7.2-6.js
|
||||
#ecma/LexicalConventions/7.3-7.js
|
||||
#ecma/LexicalConventions/7.3-8.js
|
||||
#ecma/LexicalConventions/7.3-9.js
|
||||
# syntax error
|
||||
#ecma/LexicalConventions/7.4.1-1-n.js
|
||||
# Needs eval
|
||||
#ecma/LexicalConventions/7.4.1-2-n.js
|
||||
#ecma/LexicalConventions/7.4.1-3-n.js
|
||||
#ecma/LexicalConventions/7.4.2-1-n.js
|
||||
@@ -479,9 +483,8 @@ ecma/LexicalConventions/7.2-6.js
|
||||
#ecma/LexicalConventions/7.4.3-8-n.js
|
||||
#ecma/LexicalConventions/7.4.3-9-n.js
|
||||
ecma/LexicalConventions/7.5-1.js
|
||||
# Illegal assignment?
|
||||
# Needs eval
|
||||
#ecma/LexicalConventions/7.5-10-n.js
|
||||
# syntax error
|
||||
#ecma/LexicalConventions/7.5-2-n.js
|
||||
#ecma/LexicalConventions/7.5-3-n.js
|
||||
#ecma/LexicalConventions/7.5-4-n.js
|
||||
@@ -498,12 +501,12 @@ ecma/LexicalConventions/7.7.3-1.js
|
||||
ecma/LexicalConventions/7.7.3-2.js
|
||||
ecma/LexicalConventions/7.7.3.js
|
||||
ecma/LexicalConventions/7.7.4.js
|
||||
# syntax error
|
||||
# Needs eval
|
||||
#ecma/LexicalConventions/7.8.2-n.js
|
||||
# ScriptObject:get_proto throws NullReferenceException
|
||||
#ecma/Math/15.8-1.js
|
||||
ecma/Math/15.8-2-n.js
|
||||
# Call.Resolve, function expected
|
||||
# Needs eval
|
||||
#ecma/Math/15.8-3-n.js
|
||||
# Invalid IL
|
||||
#ecma/Math/15.8.1.1-1.js
|
||||
@@ -590,13 +593,13 @@ ecma/Number/15.7.3.js
|
||||
ecma/Number/15.7.4-1.js
|
||||
ecma/Number/15.7.4.1.js
|
||||
ecma/Number/15.7.4.2-1.js
|
||||
# Invoked Number.prototype.toString or Number.prototype.valueOf method on non-number
|
||||
# Needs eval
|
||||
#ecma/Number/15.7.4.2-2-n.js
|
||||
#ecma/Number/15.7.4.2-3-n.js
|
||||
ecma/Number/15.7.4.2-4.js
|
||||
ecma/Number/15.7.4.3-1.js
|
||||
ecma/Number/15.7.4.3-2.js
|
||||
# Invoked Number.prototype.toString or Number.prototype.valueOf method on non-number
|
||||
# Needs eval
|
||||
#ecma/Number/15.7.4.3-3-n.js
|
||||
ecma/Number/15.7.4.js
|
||||
ecma/ObjectObjects/15.2.1.1.js
|
||||
@@ -620,11 +623,11 @@ ecma/ObjectObjects/15.2.4.js
|
||||
# Invalid IL
|
||||
#ecma/SourceText/6-1.js
|
||||
#ecma/SourceText/6-2.js
|
||||
# syntax error
|
||||
# Needs eval
|
||||
#ecma/Statements/12.10-1.js
|
||||
ecma/Statements/12.10.js
|
||||
ecma/Statements/12.2-1.js
|
||||
# syntax error
|
||||
# Needs eval
|
||||
#ecma/Statements/12.5-1.js
|
||||
ecma/Statements/12.5-2.js
|
||||
# Invalid IL
|
||||
@@ -636,12 +639,11 @@ ecma/Statements/12.5-2.js
|
||||
#ecma/Statements/12.6.2-3.js
|
||||
#ecma/Statements/12.6.2-4.js
|
||||
#ecma/Statements/12.6.2-5.js
|
||||
# For:Resolve throws NullReferenceException
|
||||
#ecma/Statements/12.6.2-6.js
|
||||
# endless runtime loop
|
||||
#ecma/Statements/12.6.2-7.js
|
||||
ecma/Statements/12.6.2-8.js
|
||||
# syntax error
|
||||
#ecma/Statements/12.6.2-8.js
|
||||
# Needs eval
|
||||
#ecma/Statements/12.6.2-9-n.js
|
||||
# Needs for in
|
||||
#ecma/Statements/12.6.3-1.js
|
||||
@@ -650,7 +652,7 @@ ecma/Statements/12.6.3-10.js
|
||||
#ecma/Statements/12.6.3-11.js
|
||||
#ecma/Statements/12.6.3-12.js
|
||||
ecma/Statements/12.6.3-19.js
|
||||
# syntax error
|
||||
# Needs eval
|
||||
#ecma/Statements/12.6.3-2.js
|
||||
# Needs for in
|
||||
#ecma/Statements/12.6.3-3.js
|
||||
@@ -663,7 +665,7 @@ ecma/Statements/12.6.3-19.js
|
||||
#ecma/Statements/12.6.3-8-n.js
|
||||
# Invalid IL
|
||||
#ecma/Statements/12.6.3-9-n.js
|
||||
# syntax error
|
||||
# Needs eval
|
||||
#ecma/Statements/12.7-1-n.js
|
||||
#ecma/Statements/12.8-1-n.js
|
||||
#ecma/Statements/12.9-1-n.js
|
||||
@@ -686,7 +688,7 @@ ecma/String/15.5.3.js
|
||||
#ecma/String/15.5.4.1.js
|
||||
# Invalid IL
|
||||
#ecma/String/15.5.4.10-1.js
|
||||
# syntax error
|
||||
# Needs eval
|
||||
#ecma/String/15.5.4.11-1.js
|
||||
#ecma/String/15.5.4.11-2.js
|
||||
#ecma/String/15.5.4.11-3.js
|
||||
@@ -696,7 +698,7 @@ ecma/String/15.5.3.js
|
||||
# Invalid IL
|
||||
#ecma/String/15.5.4.12-1.js
|
||||
#ecma/String/15.5.4.12-2.js
|
||||
# syntax error
|
||||
# Needs eval
|
||||
#ecma/String/15.5.4.12-3.js
|
||||
#ecma/String/15.5.4.12-4.js
|
||||
#ecma/String/15.5.4.12-5.js
|
||||
@@ -727,7 +729,7 @@ ecma/String/15.5.4.6-1.js
|
||||
#ecma/String/15.5.4.6-2.js
|
||||
# invalid IL
|
||||
#ecma/String/15.5.4.7-1.js
|
||||
# syntax error
|
||||
# Needs eval
|
||||
#ecma/String/15.5.4.7-2.js
|
||||
ecma/String/15.5.4.7-3.js
|
||||
# Invalid IL
|
||||
@@ -739,13 +741,14 @@ ecma/String/15.5.4.8-2.js
|
||||
#ecma/String/15.5.4.9-1.js
|
||||
ecma/String/15.5.4.js
|
||||
ecma/String/15.5.5.1.js
|
||||
# syntax error
|
||||
# Needs eval
|
||||
#ecma/TypeConversion/9.2.js
|
||||
# Invalid IL
|
||||
#ecma/TypeConversion/9.3-1.js
|
||||
ecma/TypeConversion/9.3.1-1.js
|
||||
ecma/TypeConversion/9.3.1-2.js
|
||||
ecma/TypeConversion/9.3.1-3.js
|
||||
# Invalid IL
|
||||
#ecma/TypeConversion/9.3.1-3.js
|
||||
# Needs eval
|
||||
#ecma/TypeConversion/9.3.js
|
||||
ecma/TypeConversion/9.4-1.js
|
||||
@@ -877,7 +880,8 @@ ecma_2/Exceptions/string-002.js
|
||||
ecma_2/Expressions/StrictEquality-001.js
|
||||
# Needs new Function
|
||||
#ecma_2/Expressions/instanceof-001.js
|
||||
ecma_2/Expressions/instanceof-002.js
|
||||
# Convert:ToObject throws JScriptException: Unexpected type
|
||||
#ecma_2/Expressions/instanceof-002.js
|
||||
# Needs new Function
|
||||
#ecma_2/Expressions/instanceof-003-n.js
|
||||
#ecma_2/Expressions/instanceof-004-n.js
|
||||
@@ -906,10 +910,11 @@ ecma_2/RegExp/regress-001.js
|
||||
# RegExpObject:Initialize throws JScriptException
|
||||
#ecma_2/RegExp/unicode-001.js
|
||||
ecma_2/Statements/dowhile-001.js
|
||||
# SemanticAnalyser:NeedsToBoolean throws NotImplementedException
|
||||
# invalid IL
|
||||
#ecma_2/Statements/dowhile-002.js
|
||||
ecma_2/Statements/dowhile-003.js
|
||||
# SemanticAnalyser:NeedsToBoolean throws NotImplementedException
|
||||
# Invalid IL
|
||||
#ecma_2/Statements/dowhile-003.js
|
||||
# invalid IL
|
||||
#ecma_2/Statements/dowhile-004.js
|
||||
ecma_2/Statements/dowhile-005.js
|
||||
ecma_2/Statements/dowhile-006.js
|
||||
@@ -949,7 +954,7 @@ ecma_2/String/match-003.js
|
||||
ecma_2/String/match-004.js
|
||||
ecma_2/String/replace-001.js
|
||||
ecma_2/String/split-001.js
|
||||
# Trace/breakpoint trap
|
||||
# Invalid IL
|
||||
#ecma_2/String/split-002.js
|
||||
ecma_2/String/split-003.js
|
||||
# Invalid IL
|
||||
@@ -967,9 +972,10 @@ js1_2/Array/general2.js
|
||||
# NullReferenceException from Binary:emit_access
|
||||
#js1_2/Array/splice1.js
|
||||
#js1_2/Array/splice2.js
|
||||
js1_2/Array/tostring_1.js
|
||||
# LateBinding:CallValue throws NullReferenceException
|
||||
#js1_2/Array/tostring_1.js
|
||||
js1_2/Array/tostring_2.js
|
||||
# Trace/breakpoint trap
|
||||
# Invalid IL
|
||||
#js1_2/Objects/toString-001.js
|
||||
js1_2/String/charCodeAt.js
|
||||
js1_2/String/concat.js
|
||||
@@ -1010,7 +1016,8 @@ js1_2/regexp/RegExp_multiline_as_array.js
|
||||
js1_2/regexp/RegExp_object.js
|
||||
js1_2/regexp/RegExp_rightContext.js
|
||||
js1_2/regexp/RegExp_rightContext_as_array.js
|
||||
js1_2/regexp/alphanumeric.js
|
||||
# LateBinding:CallValue throws InvalidCastException
|
||||
#js1_2/regexp/alphanumeric.js
|
||||
js1_2/regexp/asterisk.js
|
||||
js1_2/regexp/backslash.js
|
||||
js1_2/regexp/backspace.js
|
||||
@@ -1019,7 +1026,8 @@ js1_2/regexp/backspace.js
|
||||
js1_2/regexp/character_class.js
|
||||
js1_2/regexp/compile.js
|
||||
js1_2/regexp/control_characters.js
|
||||
js1_2/regexp/digit.js
|
||||
# LateBinding:CallValue throws InvalidCastException
|
||||
#js1_2/regexp/digit.js
|
||||
js1_2/regexp/dot.js
|
||||
# Invalid IL
|
||||
#js1_2/regexp/endLine.js
|
||||
@@ -1046,8 +1054,9 @@ js1_2/regexp/string_split.js
|
||||
js1_2/regexp/test.js
|
||||
js1_2/regexp/toString.js
|
||||
js1_2/regexp/vertical_bar.js
|
||||
js1_2/regexp/whitespace.js
|
||||
js1_2/regexp/word_boundary.js
|
||||
# LateBinding:CallValue throws InvalidCastException
|
||||
#js1_2/regexp/whitespace.js
|
||||
#js1_2/regexp/word_boundary.js
|
||||
# Need for in
|
||||
#js1_2/regress/regress-7703.js
|
||||
js1_2/statements/break.js
|
||||
@@ -1070,8 +1079,9 @@ js1_3/Script/switch-001.js
|
||||
js1_3/inherit/proto_1.js
|
||||
# Convert:ToObject throws JScriptException: Unexpected type
|
||||
#js1_3/inherit/proto_10.js
|
||||
js1_3/inherit/proto_11.js
|
||||
js1_3/inherit/proto_12.js
|
||||
# Invalid IL
|
||||
#js1_3/inherit/proto_11.js
|
||||
#js1_3/inherit/proto_12.js
|
||||
js1_3/inherit/proto_2.js
|
||||
js1_3/inherit/proto_3.js
|
||||
js1_3/inherit/proto_4.js
|
||||
|
||||
@@ -1,7 +1,3 @@
|
||||
2005-12-16 Sebastien Pouliot <[email protected]>
|
||||
|
||||
* X509Chain.cs: Fix chain building. Patch from Vincent Cote-Roy.
|
||||
|
||||
2005-11-18 Sebastien Pouliot <[email protected]>
|
||||
|
||||
* X509Extension.cs: Changed default ctor to protected to help
|
||||
|
||||
@@ -129,9 +129,11 @@ namespace Mono.Security.X509 {
|
||||
X509Certificate x = leaf;
|
||||
X509Certificate tmp = x;
|
||||
while ((x != null) && (!x.IsSelfSigned)) {
|
||||
tmp = x; // last valid
|
||||
_chain.Add (x);
|
||||
x = FindCertificateParent (x);
|
||||
tmp = FindCertificateParent (x);
|
||||
if (x != null) {
|
||||
_chain.Add (x);
|
||||
x = tmp; // last valid
|
||||
}
|
||||
}
|
||||
// find a trusted root
|
||||
_root = FindCertificateRoot (tmp);
|
||||
|
||||
@@ -1,3 +1,8 @@
|
||||
2005-12-15 Loren Bandiera <[email protected]>
|
||||
|
||||
* Novell.Directory.Ldap.Utilclass/ResoucesHandler.cs: Fix loading of result code messages
|
||||
* Novell.Directory.Ldap/Connection.cs: Check GAC for Mono.Security assembly
|
||||
|
||||
2005-12-06 Konstantin Triger <[email protected]>
|
||||
|
||||
* Novell.Directory.Ldap.vmwcsproj: fixing conditional compilation constants.
|
||||
|
||||
@@ -1,33 +1,3 @@
|
||||
2005-12-16 Chris Toshok <[email protected]>
|
||||
|
||||
* ConfigurationLockCollection.cs (Add): only add the name if it's
|
||||
not already there.
|
||||
(IsReadOnly): always return false for the time being, in the
|
||||
non-exceptional case.
|
||||
|
||||
2005-12-15 Chris Toshok <[email protected]>
|
||||
|
||||
* ConfigurationElement.cs (LockAllAttributesExcept): implement.
|
||||
(LockAllElementsExcept): implement.
|
||||
(DeserializeElement): handle the built-in attributes (lock* for
|
||||
the time being).
|
||||
|
||||
2005-12-15 Chris Toshok <[email protected]>
|
||||
|
||||
* ConfigurationLockCollection.cs (..ctor): don't call Populate.
|
||||
(Populate): nuke.
|
||||
(CheckName): make sure the passes in name is valid for this type
|
||||
of lock collection.
|
||||
(Add): call CheckName, and set is_modified to true.
|
||||
(Clear): set is_modified.
|
||||
(IsReadOnly): add plausable implementation, including exception in
|
||||
the case where the name isn't found.
|
||||
(Remove): set is_modified.
|
||||
(SetFromList): implement.
|
||||
(get_AttributeList): implement.
|
||||
(set_IsModified): add internal setter so we can clear the modified
|
||||
flag.
|
||||
|
||||
2005-12-12 Chris Toshok <[email protected]>
|
||||
|
||||
* AppSettingsSection.cs (DeserializeElement): provide rather naive
|
||||
|
||||
@@ -89,28 +89,21 @@ namespace System.Configuration
|
||||
}
|
||||
}
|
||||
|
||||
ConfigurationLockCollection lockAllAttributesExcept;
|
||||
[MonoTODO]
|
||||
public ConfigurationLockCollection LockAllAttributesExcept {
|
||||
get {
|
||||
if (lockAllAttributesExcept == null) {
|
||||
lockAllAttributesExcept = new ConfigurationLockCollection (this, ConfigurationLockType.Attribute | ConfigurationLockType.Exclude);
|
||||
}
|
||||
|
||||
return lockAllAttributesExcept;
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
}
|
||||
|
||||
ConfigurationLockCollection lockAllElementsExcept;
|
||||
[MonoTODO]
|
||||
public ConfigurationLockCollection LockAllElementsExcept {
|
||||
get {
|
||||
if (lockAllElementsExcept == null) {
|
||||
lockAllElementsExcept = new ConfigurationLockCollection (this, ConfigurationLockType.Element | ConfigurationLockType.Exclude);
|
||||
}
|
||||
|
||||
return lockAllElementsExcept;
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
ConfigurationLockCollection lockAttributes;
|
||||
public ConfigurationLockCollection LockAttributes {
|
||||
get {
|
||||
@@ -122,14 +115,10 @@ namespace System.Configuration
|
||||
}
|
||||
}
|
||||
|
||||
ConfigurationLockCollection lockElements;
|
||||
[MonoTODO]
|
||||
public ConfigurationLockCollection LockElements {
|
||||
get {
|
||||
if (lockElements == null) {
|
||||
lockElements = new ConfigurationLockCollection (this, ConfigurationLockType.Element);
|
||||
}
|
||||
|
||||
return lockElements;
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -282,22 +271,8 @@ namespace System.Configuration
|
||||
{
|
||||
PropertyInformation prop = ElementInformation.Properties [reader.LocalName];
|
||||
if (prop == null || (serializeCollectionKey && !prop.IsKey)) {
|
||||
/* handle the built in ConfigurationElement attributes here */
|
||||
if (reader.LocalName == "lockAllAttributesExcept") {
|
||||
LockAllAttributesExcept.SetFromList (reader.Value);
|
||||
}
|
||||
else if (reader.LocalName == "lockAllElementsExcept") {
|
||||
LockAllElementsExcept.SetFromList (reader.Value);
|
||||
}
|
||||
else if (reader.LocalName == "lockAttributes") {
|
||||
LockAttributes.SetFromList (reader.Value);
|
||||
}
|
||||
else if (reader.LocalName == "lockElements") {
|
||||
LockElements.SetFromList (reader.Value);
|
||||
}
|
||||
else if (!OnDeserializeUnrecognizedAttribute (reader.LocalName, reader.Value))
|
||||
if (!OnDeserializeUnrecognizedAttribute (reader.LocalName, reader.Value))
|
||||
throw new ConfigurationException ("Unrecognized attribute '" + reader.LocalName + "'.");
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
+29
-67
@@ -47,9 +47,6 @@ namespace System.Configuration
|
||||
ArrayList names;
|
||||
ConfigurationElement element;
|
||||
ConfigurationLockType lockType;
|
||||
bool is_modified;
|
||||
Hashtable valid_name_hash;
|
||||
string valid_names;
|
||||
|
||||
internal ConfigurationLockCollection (ConfigurationElement element,
|
||||
ConfigurationLockType lockType)
|
||||
@@ -57,54 +54,27 @@ namespace System.Configuration
|
||||
names = new ArrayList ();
|
||||
this.element = element;
|
||||
this.lockType = lockType;
|
||||
|
||||
Populate();
|
||||
}
|
||||
|
||||
void CheckName (string name)
|
||||
void Populate ()
|
||||
{
|
||||
bool isAttribute = (lockType & ConfigurationLockType.Attribute) == ConfigurationLockType.Attribute;
|
||||
|
||||
if (valid_name_hash == null) {
|
||||
valid_name_hash = new Hashtable ();
|
||||
foreach (ConfigurationProperty prop in element.Properties) {
|
||||
if (isAttribute == prop.IsElement)
|
||||
continue;
|
||||
valid_name_hash.Add (prop.Name, true);
|
||||
}
|
||||
|
||||
/* add the add/remove/clear names of the
|
||||
* default collection if there is one */
|
||||
if (!isAttribute) {
|
||||
ConfigurationElementCollection c = element.GetDefaultCollection ();
|
||||
valid_name_hash.Add (c.AddElementName, true);
|
||||
valid_name_hash.Add (c.ClearElementName, true);
|
||||
valid_name_hash.Add (c.RemoveElementName, true);
|
||||
}
|
||||
|
||||
string[] valid_name_array = new string[valid_name_hash.Keys.Count];
|
||||
valid_name_hash.Keys.CopyTo (valid_name_array, 0);
|
||||
|
||||
valid_names = String.Join (",", valid_name_array);
|
||||
foreach (ConfigurationProperty prop in element.Properties) {
|
||||
if ((lockType & ConfigurationLockType.Attribute) != ConfigurationLockType.Attribute
|
||||
|| !prop.IsDefaultCollection)
|
||||
Add (prop.Name);
|
||||
}
|
||||
|
||||
if (valid_name_hash [name] == null)
|
||||
throw new ConfigurationErrorsException (
|
||||
String.Format ("The {2} '{0}' is not valid in the locked list for this section. The following {3} can be locked: '{1}'",
|
||||
name, valid_names, isAttribute ? "attribute" : "element", isAttribute ? "attributes" : "elements"));
|
||||
}
|
||||
|
||||
public void Add (string name)
|
||||
{
|
||||
CheckName (name);
|
||||
if (!names.Contains (name)) {
|
||||
names.Add (name);
|
||||
is_modified = true;
|
||||
}
|
||||
names.Add (name);
|
||||
}
|
||||
|
||||
public void Clear ()
|
||||
{
|
||||
names.Clear ();
|
||||
is_modified = true;
|
||||
}
|
||||
|
||||
public bool Contains (string name)
|
||||
@@ -122,37 +92,21 @@ namespace System.Configuration
|
||||
return names.GetEnumerator ();
|
||||
}
|
||||
|
||||
[MonoTODO ("we can't possibly *always* return false here...")]
|
||||
[MonoTODO]
|
||||
public bool IsReadOnly (string name)
|
||||
{
|
||||
for (int i = 0; i < names.Count; i ++) {
|
||||
if (names[i] == name) {
|
||||
/* this test used to switch off whether the collection was 'Exclude' or not
|
||||
* (the LockAll*Except collections), but that doesn't seem to be the crux of
|
||||
* it. maybe this returns true if the element/attribute is locked in a parent
|
||||
* element's lock collections? */
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
throw new ConfigurationErrorsException (String.Format ("The entry '{0}' is not in the collection.", name));
|
||||
return false; /* XXX */
|
||||
}
|
||||
|
||||
public void Remove (string name)
|
||||
{
|
||||
names.Remove (name);
|
||||
is_modified = true;
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public void SetFromList (string attributeList)
|
||||
{
|
||||
Clear ();
|
||||
|
||||
char [] split = {','};
|
||||
string [] attrs = attributeList.Split (split);
|
||||
foreach (string a in attrs) {
|
||||
Add (a.Trim ());
|
||||
}
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
|
||||
void ICollection.CopyTo (System.Array array, int index)
|
||||
@@ -160,37 +114,45 @@ namespace System.Configuration
|
||||
names.CopyTo (array, index);
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public string AttributeList {
|
||||
get {
|
||||
string[] name_arr = new string[names.Count];
|
||||
names.CopyTo (name_arr, 0);
|
||||
return String.Join (",", name_arr);
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
}
|
||||
|
||||
public int Count {
|
||||
get { return names.Count; }
|
||||
get {
|
||||
return names.Count;
|
||||
}
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public bool HasParentElements {
|
||||
get { return false; /* XXX */ }
|
||||
get {
|
||||
return false; /* XXX */
|
||||
}
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public bool IsModified {
|
||||
get { return is_modified; }
|
||||
internal set { is_modified = value; }
|
||||
get {
|
||||
return false; /* XXX */
|
||||
}
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public bool IsSynchronized {
|
||||
get { return false; /* XXX */ }
|
||||
get {
|
||||
return false; /* XXX */
|
||||
}
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public object SyncRoot {
|
||||
get { return this; /* XXX */ }
|
||||
get {
|
||||
return this; /* XXX */
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,8 +1,3 @@
|
||||
2005-12-16 Chris Toshok <[email protected]>
|
||||
|
||||
* System.Configuration/ConfigurationLockCollectionTest.cs
|
||||
(DuplicateAdd, IsReadOnly): new tests.
|
||||
|
||||
2005-12-06 Chris Toshok <[email protected]>
|
||||
|
||||
* System.Configuration/ConnectionStringSettingsTest.cs (NameNull):
|
||||
|
||||
-29
@@ -142,36 +142,7 @@ namespace MonoTests.System.Configuration {
|
||||
col.SetFromList (" file ");
|
||||
Assert.AreEqual (1, col.Count, "A1");
|
||||
Assert.IsTrue (col.Contains ("file"), "A2");
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void DuplicateAdd ()
|
||||
{
|
||||
SysConfig cfg = ConfigurationManager.OpenExeConfiguration (ConfigurationUserLevel.None);
|
||||
AppSettingsSection app = cfg.AppSettings;
|
||||
|
||||
app.LockAttributes.Clear ();
|
||||
|
||||
app.LockAttributes.Add ("file");
|
||||
app.LockAttributes.Add ("file");
|
||||
|
||||
Assert.AreEqual (1, app.LockAttributes.Count, "A1");
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void IsReadOnly ()
|
||||
{
|
||||
SysConfig cfg = ConfigurationManager.OpenExeConfiguration (ConfigurationUserLevel.None);
|
||||
AppSettingsSection app = cfg.AppSettings;
|
||||
|
||||
app.LockAttributes.Clear ();
|
||||
app.LockAllAttributesExcept.Clear ();
|
||||
|
||||
app.LockAttributes.Add ("file");
|
||||
Assert.IsFalse (app.LockAttributes.IsReadOnly ("file"), "A1");
|
||||
|
||||
app.LockAllAttributesExcept.Add ("file");
|
||||
Assert.IsFalse (app.LockAllAttributesExcept.IsReadOnly ("file"), "A2");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
TESTS = t1.exe t2.exe t3.exe t4.exe t5.exe t6.exe t7.exe t8.exe t9.exe t10.exe t11.exe t12.exe t13.exe t14.exe t15.exe t16.exe t17.exe t18.exe t19.exe
|
||||
TESTS = t1.exe t2.exe t3.exe t4.exe t5.exe t6.exe t7.exe t8.exe t9.exe t10.exe t11.exe t12.exe t13.exe t14.exe
|
||||
|
||||
check: local compare
|
||||
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
using System;
|
||||
using System.Configuration;
|
||||
|
||||
class T1
|
||||
{
|
||||
static void Main(string[] args)
|
||||
{
|
||||
try
|
||||
{
|
||||
Configuration config = ConfigurationManager.OpenExeConfiguration (ConfigurationUserLevel.None);
|
||||
AppSettingsSection sect = (AppSettingsSection)config.GetSection("appSettings");
|
||||
|
||||
foreach (string key in sect.Settings.AllKeys) {
|
||||
KeyValueConfigurationElement e = sect.Settings[key];
|
||||
Console.WriteLine ("{0} = {1}", e.Key, e.Value);
|
||||
}
|
||||
|
||||
Console.WriteLine ("lockAllAttributesExcept = '{0}'", sect.LockAllAttributesExcept.AttributeList);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Console.WriteLine ("Exception raised: {0}\n{1}", e.GetType(), e);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,5 +0,0 @@
|
||||
<configuration>
|
||||
<appSettings lockAllAttributesExcept="file">
|
||||
<add key="aloha" value="aloha" />
|
||||
</appSettings>
|
||||
</configuration>
|
||||
@@ -1,2 +0,0 @@
|
||||
aloha = aloha
|
||||
lockAllAttributesExcept = 'file'
|
||||
@@ -1,25 +0,0 @@
|
||||
using System;
|
||||
using System.Configuration;
|
||||
|
||||
class T1
|
||||
{
|
||||
static void Main(string[] args)
|
||||
{
|
||||
try
|
||||
{
|
||||
Configuration config = ConfigurationManager.OpenExeConfiguration (ConfigurationUserLevel.None);
|
||||
AppSettingsSection sect = (AppSettingsSection)config.GetSection("appSettings");
|
||||
|
||||
foreach (string key in sect.Settings.AllKeys) {
|
||||
KeyValueConfigurationElement e = sect.Settings[key];
|
||||
Console.WriteLine ("{0} = {1}", e.Key, e.Value);
|
||||
}
|
||||
|
||||
Console.WriteLine ("lockAttributes = '{0}'", sect.LockAttributes.AttributeList);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Console.WriteLine ("Exception raised: {0}\n{1}", e.GetType(), e);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,5 +0,0 @@
|
||||
<configuration>
|
||||
<appSettings lockAttributes="file">
|
||||
<add key="aloha" value="aloha" />
|
||||
</appSettings>
|
||||
</configuration>
|
||||
@@ -1,2 +0,0 @@
|
||||
aloha = aloha
|
||||
lockAttributes = 'file'
|
||||
@@ -1,2 +0,0 @@
|
||||
aloha = aloha
|
||||
lockAttributes = 'file'
|
||||
@@ -1,25 +0,0 @@
|
||||
using System;
|
||||
using System.Configuration;
|
||||
|
||||
class T1
|
||||
{
|
||||
static void Main(string[] args)
|
||||
{
|
||||
try
|
||||
{
|
||||
Configuration config = ConfigurationManager.OpenExeConfiguration (ConfigurationUserLevel.None);
|
||||
AppSettingsSection sect = (AppSettingsSection)config.GetSection("appSettings");
|
||||
|
||||
foreach (string key in sect.Settings.AllKeys) {
|
||||
KeyValueConfigurationElement e = sect.Settings[key];
|
||||
Console.WriteLine ("{0} = {1}", e.Key, e.Value);
|
||||
}
|
||||
|
||||
Console.WriteLine ("lockAllElementsExcept = '{0}'", sect.LockAllElementsExcept.AttributeList);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Console.WriteLine ("Exception raised: {0}\n{1}", e.GetType(), e);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,5 +0,0 @@
|
||||
<configuration>
|
||||
<appSettings lockAllElementsExcept="add">
|
||||
<add key="aloha" value="aloha" />
|
||||
</appSettings>
|
||||
</configuration>
|
||||
@@ -1,2 +0,0 @@
|
||||
aloha = aloha
|
||||
lockAllElementsExcept = 'add'
|
||||
@@ -1,2 +0,0 @@
|
||||
aloha = aloha
|
||||
lockAllElementsExcept = 'add'
|
||||
@@ -1,25 +0,0 @@
|
||||
using System;
|
||||
using System.Configuration;
|
||||
|
||||
class T1
|
||||
{
|
||||
static void Main(string[] args)
|
||||
{
|
||||
try
|
||||
{
|
||||
Configuration config = ConfigurationManager.OpenExeConfiguration (ConfigurationUserLevel.None);
|
||||
AppSettingsSection sect = (AppSettingsSection)config.GetSection("appSettings");
|
||||
|
||||
foreach (string key in sect.Settings.AllKeys) {
|
||||
KeyValueConfigurationElement e = sect.Settings[key];
|
||||
Console.WriteLine ("{0} = {1}", e.Key, e.Value);
|
||||
}
|
||||
|
||||
Console.WriteLine ("lockElements = '{0}'", sect.LockElements.AttributeList);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Console.WriteLine ("Exception raised: {0}\n{1}", e.GetType(), e);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,5 +0,0 @@
|
||||
<configuration>
|
||||
<appSettings lockElements="clear">
|
||||
<add key="aloha" value="aloha" />
|
||||
</appSettings>
|
||||
</configuration>
|
||||
@@ -1,2 +0,0 @@
|
||||
aloha = aloha
|
||||
lockElements = 'clear'
|
||||
@@ -1,2 +0,0 @@
|
||||
aloha = aloha
|
||||
lockElements = 'clear'
|
||||
@@ -1,25 +0,0 @@
|
||||
using System;
|
||||
using System.Configuration;
|
||||
|
||||
class T1
|
||||
{
|
||||
static void Main(string[] args)
|
||||
{
|
||||
try
|
||||
{
|
||||
Configuration config = ConfigurationManager.OpenExeConfiguration (ConfigurationUserLevel.None);
|
||||
AppSettingsSection sect = (AppSettingsSection)config.GetSection("appSettings");
|
||||
|
||||
foreach (string key in sect.Settings.AllKeys) {
|
||||
KeyValueConfigurationElement e = sect.Settings[key];
|
||||
Console.WriteLine ("{0} = {1}", e.Key, e.Value);
|
||||
}
|
||||
|
||||
Console.WriteLine ("lockAllAttributesExcept = '{0}'", sect.LockAllAttributesExcept.AttributeList);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Console.WriteLine ("Exception raised: {0}", e.GetType());
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,5 +0,0 @@
|
||||
<configuration>
|
||||
<appSettings lockAllAttributesExcept="unknown">
|
||||
<add key="aloha" value="aloha" />
|
||||
</appSettings>
|
||||
</configuration>
|
||||
@@ -1 +0,0 @@
|
||||
Exception raised: System.Configuration.ConfigurationErrorsException
|
||||
@@ -1,28 +1,3 @@
|
||||
2005-12-20 Daniel Morgan <[email protected]>
|
||||
|
||||
* System.Data.OracleClient/OracleConnectionPoolManager.cs
|
||||
* System.Data.OracleClient/OracleConnectionPool.cs
|
||||
* System.Data.OracleClient/OracleConnection.cs
|
||||
* System.Data.OracleClient/OciGlue.cs
|
||||
* System.Data.OracleClient.Oci/OciEnvironmentHandle.cs
|
||||
* System.Data.OracleClient.Oci/OciErrorHandle.cs
|
||||
* System.Data.OracleClient.Oci/OciServiceHandle.cs
|
||||
* System.Data.OracleClient.Oci/OciSessionHandle.cs: modified
|
||||
- support Integrated Security which is external authentication
|
||||
- dispose of OCI handles properly to prevent SEGSIGV during finalization
|
||||
at application exit
|
||||
|
||||
2005-12-19 Daniel Morgan <[email protected]>
|
||||
|
||||
* System.Data.OracleClient/OracleConnectionPoolManager.cs
|
||||
* System.Data.OracleClient/OracleConnectionPool.cs
|
||||
* System.Data.OracleClient/OracleConnection.cs: for connection pooling, need to
|
||||
dispose of any connection pools properly otherwise a SEGSIGV may happen trying
|
||||
to detach from the server during finalization at exit of app
|
||||
|
||||
* System.Data.OracleClient/OracleDataReader.cs: need to make sure statement and command
|
||||
exists during dispose because they are set to null when closed
|
||||
|
||||
2005-12-13 Daniel Morgan <[email protected]>
|
||||
|
||||
* System.Data.OracleClient/OracleParameter.cs: free
|
||||
|
||||
+22
-1
@@ -50,7 +50,28 @@ namespace System.Data.OracleClient.Oci {
|
||||
|
||||
public OciErrorInfo HandleError ()
|
||||
{
|
||||
OciErrorInfo info = OciErrorHandle.HandleError (this);
|
||||
int errbufSize = 512;
|
||||
IntPtr errbuf = Marshal.AllocHGlobal (errbufSize);
|
||||
|
||||
OciErrorInfo info;
|
||||
info.ErrorCode = 0;
|
||||
info.ErrorMessage = String.Empty;
|
||||
|
||||
OciCalls.OCIErrorGet (Handle,
|
||||
1,
|
||||
IntPtr.Zero,
|
||||
out info.ErrorCode,
|
||||
errbuf,
|
||||
(uint) errbufSize,
|
||||
OciHandleType.Environment);
|
||||
|
||||
object err = Marshal.PtrToStringAnsi (errbuf);
|
||||
if (err != null) {
|
||||
string errmsg = (string) err;
|
||||
info.ErrorMessage = String.Copy (errmsg);
|
||||
Marshal.FreeHGlobal (errbuf);
|
||||
}
|
||||
|
||||
return info;
|
||||
}
|
||||
|
||||
|
||||
@@ -47,7 +47,7 @@ namespace System.Data.OracleClient.Oci {
|
||||
}
|
||||
}
|
||||
|
||||
public static OciErrorInfo HandleError (OciHandle hand)
|
||||
public OciErrorInfo HandleError ()
|
||||
{
|
||||
OciErrorInfo info;
|
||||
info.ErrorCode = 0;
|
||||
@@ -56,7 +56,7 @@ namespace System.Data.OracleClient.Oci {
|
||||
int errbufSize = 4096;
|
||||
IntPtr errbuf = Marshal.AllocHGlobal (errbufSize);
|
||||
|
||||
OciCalls.OCIErrorGet (hand,
|
||||
OciCalls.OCIErrorGet (this,
|
||||
1,
|
||||
IntPtr.Zero,
|
||||
out info.ErrorCode,
|
||||
@@ -64,36 +64,24 @@ namespace System.Data.OracleClient.Oci {
|
||||
(uint) errbufSize,
|
||||
OciHandleType.Error);
|
||||
|
||||
//object err = Marshal.PtrToStringAuto (errbuf);
|
||||
byte[] bytea = new byte[errbufSize];
|
||||
Marshal.Copy (errbuf, bytea, 0, errbufSize);
|
||||
errbufSize = 0;
|
||||
|
||||
OciHandle h = hand.Parent;
|
||||
if (h == null)
|
||||
h = hand;
|
||||
|
||||
// first call to OCICharSetToUnicode gets the size
|
||||
OciCalls.OCICharSetToUnicode (h, null, bytea, out errbufSize);
|
||||
OciCalls.OCICharSetToUnicode (Parent, null, bytea, out errbufSize);
|
||||
StringBuilder str = new StringBuilder (errbufSize);
|
||||
|
||||
// second call to OCICharSetToUnicode gets the string
|
||||
OciCalls.OCICharSetToUnicode (h, str, bytea, out errbufSize);
|
||||
|
||||
OciCalls.OCICharSetToUnicode (Parent, str, bytea, out errbufSize);
|
||||
string errmsg = String.Empty;
|
||||
if (errbufSize > 0)
|
||||
errmsg = str.ToString ();
|
||||
|
||||
info.ErrorMessage = String.Copy (errmsg);
|
||||
Marshal.FreeHGlobal (errbuf);
|
||||
|
||||
return info;
|
||||
}
|
||||
|
||||
public OciErrorInfo HandleError ()
|
||||
{
|
||||
return HandleError (this);
|
||||
}
|
||||
|
||||
#endregion // Methods
|
||||
}
|
||||
}
|
||||
@@ -74,7 +74,7 @@ namespace System.Data.OracleClient.Oci {
|
||||
{
|
||||
if (!disposed) {
|
||||
try {
|
||||
//Detach (errorHandle);
|
||||
Detach (errorHandle);
|
||||
disposed = true;
|
||||
} finally {
|
||||
base.Dispose (disposing);
|
||||
|
||||
@@ -56,10 +56,10 @@ namespace System.Data.OracleClient.Oci {
|
||||
if (!disposed) {
|
||||
try {
|
||||
if (disposing) {
|
||||
//if (server != null)
|
||||
// server.Dispose ();
|
||||
//if (session != null)
|
||||
// session.Dispose ();
|
||||
if (server != null)
|
||||
server.Dispose ();
|
||||
if (session != null)
|
||||
session.Dispose ();
|
||||
}
|
||||
disposed = true;
|
||||
} finally {
|
||||
|
||||
+20
-24
@@ -29,7 +29,6 @@ namespace System.Data.OracleClient.Oci {
|
||||
bool disposed = false;
|
||||
string username;
|
||||
string password;
|
||||
OciCredentialType credentialType;
|
||||
|
||||
#endregion // Fields
|
||||
|
||||
@@ -49,13 +48,13 @@ namespace System.Data.OracleClient.Oci {
|
||||
set { serviceHandle = value; }
|
||||
}
|
||||
|
||||
internal string Username {
|
||||
public string Username {
|
||||
get { return username; }
|
||||
set { username = value; }
|
||||
}
|
||||
|
||||
internal string Password {
|
||||
get { return String.Empty; }
|
||||
public string Password {
|
||||
get { return password; }
|
||||
set { password = value; }
|
||||
}
|
||||
|
||||
@@ -69,27 +68,25 @@ namespace System.Data.OracleClient.Oci {
|
||||
|
||||
int status = 0;
|
||||
|
||||
if (credentialType == OciCredentialType.RDBMS) {
|
||||
status = OciCalls.OCIAttrSetString (this,
|
||||
OciHandleType.Session,
|
||||
username,
|
||||
(uint) username.Length,
|
||||
OciAttributeType.Username,
|
||||
errorHandle);
|
||||
status = OciCalls.OCIAttrSetString (this,
|
||||
OciHandleType.Session,
|
||||
username,
|
||||
(uint) username.Length,
|
||||
OciAttributeType.Username,
|
||||
errorHandle);
|
||||
|
||||
if (status != 0)
|
||||
return false;
|
||||
if (status != 0)
|
||||
return false;
|
||||
|
||||
status = OciCalls.OCIAttrSetString (this,
|
||||
OciHandleType.Session,
|
||||
password,
|
||||
(uint) password.Length,
|
||||
OciAttributeType.Password,
|
||||
errorHandle);
|
||||
status = OciCalls.OCIAttrSetString (this,
|
||||
OciHandleType.Session,
|
||||
password,
|
||||
(uint) password.Length,
|
||||
OciAttributeType.Password,
|
||||
errorHandle);
|
||||
|
||||
if (status != 0)
|
||||
return false;
|
||||
}
|
||||
if (status != 0)
|
||||
return false;
|
||||
|
||||
status = OciCalls.OCISessionBegin (Service,
|
||||
errorHandle,
|
||||
@@ -110,14 +107,13 @@ namespace System.Data.OracleClient.Oci {
|
||||
if (!begun)
|
||||
return;
|
||||
OciCalls.OCISessionEnd (Service, error, this, 0);
|
||||
begun = false;
|
||||
}
|
||||
|
||||
protected override void Dispose (bool disposing)
|
||||
{
|
||||
if (!disposed) {
|
||||
try {
|
||||
//EndSession (errorHandle);
|
||||
EndSession (errorHandle);
|
||||
disposed = false;
|
||||
} finally {
|
||||
base.Dispose (disposing);
|
||||
|
||||
@@ -132,7 +132,7 @@ namespace System.Data.OracleClient.Oci {
|
||||
throw new OracleException (info.ErrorCode, info.ErrorMessage);
|
||||
}
|
||||
|
||||
if (!session.BeginSession (conInfo.CredentialType, OciSessionMode.Default, ErrorHandle)) {
|
||||
if (!session.BeginSession (OciCredentialType.RDBMS, OciSessionMode.Default, ErrorHandle)) {
|
||||
OciErrorInfo info = error.HandleError ();
|
||||
Disconnect ();
|
||||
throw new OracleException (info.ErrorCode, info.ErrorMessage);
|
||||
@@ -175,28 +175,16 @@ namespace System.Data.OracleClient.Oci {
|
||||
|
||||
public void Disconnect()
|
||||
{
|
||||
if (session != null) {
|
||||
session.EndSession (error);
|
||||
if (session != null)
|
||||
session.Dispose ();
|
||||
session = null;
|
||||
}
|
||||
if (server != null) {
|
||||
server.Detach (error);
|
||||
if (server != null)
|
||||
server.Dispose ();
|
||||
server = null;
|
||||
}
|
||||
if (error != null) {
|
||||
if (error != null)
|
||||
error.Dispose ();
|
||||
error = null;
|
||||
}
|
||||
if (service != null) {
|
||||
if (service != null)
|
||||
service.Dispose ();
|
||||
service = null;
|
||||
}
|
||||
if (environment != null) {
|
||||
if (environment != null)
|
||||
environment.Dispose ();
|
||||
environment = null;
|
||||
}
|
||||
}
|
||||
|
||||
#endregion // Methods
|
||||
|
||||
@@ -32,7 +32,6 @@ using System.Data;
|
||||
using System.Data.OracleClient.Oci;
|
||||
using System.Drawing.Design;
|
||||
using System.EnterpriseServices;
|
||||
using System.Globalization;
|
||||
using System.Text;
|
||||
|
||||
namespace System.Data.OracleClient
|
||||
@@ -43,7 +42,6 @@ namespace System.Data.OracleClient
|
||||
internal string Password;
|
||||
internal string Database;
|
||||
internal string ConnectionString;
|
||||
internal OciCredentialType CredentialType;
|
||||
}
|
||||
|
||||
[DefaultEvent ("InfoMessage")]
|
||||
@@ -353,7 +351,6 @@ namespace System.Data.OracleClient
|
||||
conInfo.Username = "";
|
||||
conInfo.Database = "";
|
||||
conInfo.Password = "";
|
||||
conInfo.CredentialType = OciCredentialType.RDBMS;
|
||||
|
||||
if (connectionString == String.Empty)
|
||||
return;
|
||||
@@ -423,11 +420,7 @@ namespace System.Data.OracleClient
|
||||
// TODO:
|
||||
break;
|
||||
case "INTEGRATED SECURITY":
|
||||
if (ConvertToBoolean("integrated security", value) == false)
|
||||
conInfo.CredentialType = OciCredentialType.RDBMS;
|
||||
else
|
||||
conInfo.CredentialType = OciCredentialType.External;
|
||||
break;
|
||||
throw new NotImplementedException ();
|
||||
case "PERSIST SECURITY INFO":
|
||||
// TODO:
|
||||
break;
|
||||
@@ -450,7 +443,18 @@ namespace System.Data.OracleClient
|
||||
conInfo.Username = value;
|
||||
break;
|
||||
case "POOLING" :
|
||||
pooling = ConvertToBoolean("pooling", value);
|
||||
switch (value.ToUpper ()) {
|
||||
case "YES":
|
||||
case "TRUE":
|
||||
pooling = true;
|
||||
break;
|
||||
case "NO":
|
||||
case "FALSE":
|
||||
pooling = false;
|
||||
break;
|
||||
default:
|
||||
throw new ArgumentException("Connection parameter not supported: '" + name + "'");
|
||||
}
|
||||
break;
|
||||
default:
|
||||
throw new ArgumentException("Connection parameter not supported: '" + name + "'");
|
||||
@@ -458,27 +462,6 @@ namespace System.Data.OracleClient
|
||||
}
|
||||
}
|
||||
|
||||
private bool ConvertToBoolean(string key, string value)
|
||||
{
|
||||
string upperValue = value.ToUpper();
|
||||
|
||||
if (upperValue == "TRUE" ||upperValue == "YES") {
|
||||
return true;
|
||||
}
|
||||
else if (upperValue == "FALSE" || upperValue == "NO") {
|
||||
return false;
|
||||
}
|
||||
|
||||
throw new ArgumentException(string.Format(CultureInfo.InvariantCulture,
|
||||
"Invalid value \"{0}\" for key '{1}'.", value, key));
|
||||
}
|
||||
|
||||
|
||||
~OracleConnection()
|
||||
{
|
||||
Dispose (false);
|
||||
}
|
||||
|
||||
#endregion // Methods
|
||||
|
||||
public event OracleInfoMessageEventHandler InfoMessage;
|
||||
|
||||
@@ -96,18 +96,6 @@ namespace System.Data.OracleClient
|
||||
activeConnections++;
|
||||
return manager.CreateConnection (info);
|
||||
}
|
||||
|
||||
public void Dispose ()
|
||||
{
|
||||
if (list != null) {
|
||||
if (list.Count > 0)
|
||||
foreach (OciGlue connection in list)
|
||||
if (connection.Connected)
|
||||
connection.Disconnect ();
|
||||
list.Clear ();
|
||||
list = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
-15
@@ -57,21 +57,6 @@ namespace System.Data.OracleClient
|
||||
oci.CreateConnection (info);
|
||||
return oci;
|
||||
}
|
||||
|
||||
public void Dispose ()
|
||||
{
|
||||
if (pools != null) {
|
||||
foreach (OracleConnectionPool pool in pools)
|
||||
pool.Dispose ();
|
||||
pools.Clear ();
|
||||
pools = null;
|
||||
}
|
||||
}
|
||||
|
||||
~OracleConnectionPoolManager ()
|
||||
{
|
||||
Dispose ();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -105,14 +105,11 @@ namespace System.Data.OracleClient {
|
||||
public void Close ()
|
||||
{
|
||||
if (!isClosed) {
|
||||
GetRecordsAffected ();
|
||||
if (command != null)
|
||||
command.CloseDataReader ();
|
||||
}
|
||||
if (statement != null) {
|
||||
statement.Dispose();
|
||||
statement = null;
|
||||
GetRecordsAffected();
|
||||
command.CloseDataReader ();
|
||||
}
|
||||
statement.Dispose();
|
||||
statement = null;
|
||||
isClosed = true;
|
||||
}
|
||||
|
||||
@@ -412,8 +409,7 @@ namespace System.Data.OracleClient {
|
||||
else {
|
||||
if (this.isClosed == false) {
|
||||
if (recordsAffected == -1)
|
||||
if (statement != null)
|
||||
recordsAffected = statement.GetAttributeInt32 (OciAttributeType.RowCount, command.ErrorHandle);
|
||||
recordsAffected = statement.GetAttributeInt32 (OciAttributeType.RowCount, command.ErrorHandle);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -116,9 +116,7 @@ namespace Mono.Data.SqlExpressions {
|
||||
count++;
|
||||
Aggregate ((IConvertible)val);
|
||||
}
|
||||
if (count == 0)
|
||||
return DBNull.Value;
|
||||
|
||||
|
||||
switch (function) {
|
||||
case AggregationFunction.StDev:
|
||||
case AggregationFunction.Var:
|
||||
@@ -167,9 +165,6 @@ namespace Mono.Data.SqlExpressions {
|
||||
|
||||
private IConvertible CalcStatisticalFunction (object[] values)
|
||||
{
|
||||
if (count < 2)
|
||||
return DBNull.Value;
|
||||
|
||||
double average = (double)Convert.ChangeType(result, TypeCode.Double) / count;
|
||||
double res = 0.0;
|
||||
|
||||
@@ -184,7 +179,7 @@ namespace Mono.Data.SqlExpressions {
|
||||
|
||||
if (function == AggregationFunction.StDev)
|
||||
res = System.Math.Sqrt (res);
|
||||
|
||||
|
||||
return res;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,9 +1,3 @@
|
||||
2005-12-20 Senganal T <[email protected]>
|
||||
|
||||
* Aggregation.cs :
|
||||
Modified the Eval and CalculateStatisticalFunction to add boundary checks.
|
||||
Fixes #77025.
|
||||
|
||||
2005-11-30 Konstantin Triger <[email protected]>
|
||||
|
||||
* Parser.jay: use Convert.ToInt32() instead of cast to throw OverflowException.
|
||||
|
||||
@@ -1,11 +1,3 @@
|
||||
2005-12-12 Konstantin Triger <[email protected]>
|
||||
|
||||
* Key.cs: Added ContainsVersion function, refactoring.
|
||||
* Index.cs: Fixed Reset() to be ready for Update() calls.
|
||||
Otherwise the index can be rebuilt with new values inside the
|
||||
Update() call itself.
|
||||
Fixed FindIndexExact(), Update(), Delete().
|
||||
|
||||
2005-11-22 Konstantin Triger <[email protected]>
|
||||
|
||||
* DbProviderFactory.cs: TARGET_JVM ifdef.
|
||||
|
||||
@@ -162,7 +162,6 @@ namespace System.Data.Common
|
||||
internal void Reset()
|
||||
{
|
||||
_array = null;
|
||||
RebuildIndex();
|
||||
}
|
||||
|
||||
private void RebuildIndex()
|
||||
@@ -334,11 +333,8 @@ namespace System.Data.Common
|
||||
*/
|
||||
private int FindIndexExact(int record)
|
||||
{
|
||||
for (int i = 0, size = Size; i < size; i++)
|
||||
if (Array[i] == record)
|
||||
return i;
|
||||
|
||||
return -1;
|
||||
int index = System.Array.BinarySearch(Array,record);
|
||||
return (index > 0) ? index : -1;
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -363,7 +359,7 @@ namespace System.Data.Common
|
||||
if (oldRecord == -1)
|
||||
return;
|
||||
|
||||
int index = FindIndexExact(oldRecord);
|
||||
int index = FindIndex(oldRecord);
|
||||
if (index != -1) {
|
||||
if ((_hasDuplicates == IndexDuplicatesState.True)) {
|
||||
int c1 = 1;
|
||||
@@ -392,29 +388,18 @@ namespace System.Data.Common
|
||||
_size--;
|
||||
}
|
||||
|
||||
internal void Update(DataRow row,int newRecord)
|
||||
{
|
||||
int oldRecord = Key.GetRecord(row);
|
||||
|
||||
internal void Update(DataRow row,int oldRecord, DataRowVersion oldVersion, DataRowState oldState)
|
||||
{
|
||||
bool contains = Key.ContainsVersion (oldState, oldVersion);
|
||||
int newRecord = Key.GetRecord(row);
|
||||
// the record did not appeared in the index before update
|
||||
if (oldRecord == -1 || Size == 0 || !contains) {
|
||||
if (newRecord >= 0) {
|
||||
if (FindIndexExact(newRecord) < 0)
|
||||
Add(row,newRecord);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
// the record will not appeare in the index after update
|
||||
if (newRecord < 0 || !Key.CanContain (newRecord)) {
|
||||
Delete (oldRecord);
|
||||
if (oldRecord == -1 || Size == 0) {
|
||||
Add(row,newRecord);
|
||||
return;
|
||||
}
|
||||
|
||||
int oldIdx = FindIndexExact(oldRecord);
|
||||
int oldIdx = FindIndex(oldRecord);
|
||||
|
||||
if( oldIdx == -1 ) {
|
||||
if( oldIdx == -1 || Key.Table.RecordCache[Array[oldIdx]] != row ) {
|
||||
Add(row,newRecord);
|
||||
return;
|
||||
}
|
||||
@@ -492,15 +477,11 @@ namespace System.Data.Common
|
||||
}
|
||||
}
|
||||
|
||||
internal void Add(DataRow row) {
|
||||
Add(row, Key.GetRecord(row));
|
||||
}
|
||||
|
||||
private void Add(DataRow row,int newRecord)
|
||||
{
|
||||
int newIdx;
|
||||
|
||||
if (newRecord < 0 || !Key.CanContain (newRecord))
|
||||
if (!Key.CanContain (newRecord))
|
||||
return;
|
||||
|
||||
if (Size == 0) {
|
||||
|
||||
@@ -163,77 +163,29 @@ namespace System.Data.Common
|
||||
return _filter.EvalBoolean(_tmpRow);
|
||||
}
|
||||
|
||||
internal bool ContainsVersion (DataRowState state, DataRowVersion version)
|
||||
{
|
||||
switch (state) {
|
||||
case DataRowState.Unchanged: {
|
||||
if ((_rowStateFilter & DataViewRowState.Unchanged) != DataViewRowState.None) {
|
||||
return ((version & DataRowVersion.Default) != 0);
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
case DataRowState.Added: {
|
||||
if ((_rowStateFilter & DataViewRowState.Added) != DataViewRowState.None) {
|
||||
return ((version & DataRowVersion.Default) != 0);
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
case DataRowState.Deleted: {
|
||||
if ((_rowStateFilter & DataViewRowState.Deleted) != DataViewRowState.None) {
|
||||
return (version == DataRowVersion.Original);
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
default:
|
||||
if ((_rowStateFilter & DataViewRowState.ModifiedCurrent) != DataViewRowState.None) {
|
||||
return ((version & DataRowVersion.Default) != 0);
|
||||
}
|
||||
else if ((_rowStateFilter & DataViewRowState.ModifiedOriginal) != DataViewRowState.None) {
|
||||
return (version == DataRowVersion.Original);
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
internal static int GetRecord(DataRow row, DataViewRowState rowStateFilter)
|
||||
{
|
||||
switch (row.RowState) {
|
||||
case DataRowState.Unchanged: {
|
||||
if ((rowStateFilter & DataViewRowState.Unchanged) != DataViewRowState.None) {
|
||||
return row.Proposed >= 0 ? row.Proposed : row.Current;
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
case DataRowState.Added: {
|
||||
if ((rowStateFilter & DataViewRowState.Added) != DataViewRowState.None) {
|
||||
return row.Proposed >= 0 ? row.Proposed : row.Current;
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
case DataRowState.Deleted: {
|
||||
if ((rowStateFilter & DataViewRowState.Deleted) != DataViewRowState.None) {
|
||||
if (row.Original == row.Current) {
|
||||
if ((rowStateFilter & DataViewRowState.Unchanged) != DataViewRowState.None) {
|
||||
return row.Current;
|
||||
}
|
||||
}
|
||||
else if (row.Original == -1) {
|
||||
if ((rowStateFilter & DataViewRowState.Added) != DataViewRowState.None) {
|
||||
return row.Current;
|
||||
}
|
||||
}
|
||||
else if (row.Current == -1) {
|
||||
if ((rowStateFilter & DataViewRowState.Deleted) != DataViewRowState.None) {
|
||||
return row.Original;
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
default:
|
||||
if ((rowStateFilter & DataViewRowState.ModifiedCurrent) != DataViewRowState.None) {
|
||||
return row.Proposed >= 0 ? row.Proposed : row.Current;
|
||||
}
|
||||
else if ((rowStateFilter & DataViewRowState.ModifiedOriginal) != DataViewRowState.None) {
|
||||
return row.Original;
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
else if ((rowStateFilter & DataViewRowState.ModifiedCurrent) != DataViewRowState.None) {
|
||||
return row.Current;
|
||||
}
|
||||
else if ((rowStateFilter & DataViewRowState.ModifiedOriginal) != DataViewRowState.None) {
|
||||
return row.Original;
|
||||
}
|
||||
|
||||
return -1;
|
||||
|
||||
@@ -563,14 +563,21 @@ namespace System.Data.Common
|
||||
switch (ProviderType) {
|
||||
case PROVIDER_TYPE.SQLOLEDB :
|
||||
if (String.Empty.Equals(port)) {
|
||||
try {
|
||||
port = DbPortResolver.getMSSqlPort(this).ToString();
|
||||
}
|
||||
catch (SQLException e) {
|
||||
throw CreateException(e);
|
||||
}
|
||||
// if needed - resolve MSSQL port
|
||||
// FIXME : decide about behaviour in the case all the timeout spent on port resolution
|
||||
//long start = DateTime.Now.Ticks;
|
||||
port = DbPortResolver.getMSSqlPort(DataSource,InstanceName,ConnectionTimeout).ToString();
|
||||
//long end = DateTime.Now.Ticks;
|
||||
//if( (end - start) < ConnectionTimeout*1000000) {
|
||||
//timeout -= (int)(end - start)/1000000;
|
||||
//}
|
||||
}
|
||||
// todo : what should we do if all the timeout spent on port resolution ?
|
||||
if ("-1".Equals(port)) {
|
||||
string message = String.Format ("Unable to retrieve the port number for {0} using UDP on port 1434. Please see your network administrator to solve this problem or add the port number of your SQL server instance to your connection string (i.e. port=1681).",ServerName);
|
||||
Exception e = CreateException (message);
|
||||
throw e;
|
||||
}
|
||||
|
||||
ConnectionStringHelper.AddValue(UserParameters,StringManager.GetStringArray("CON_PORT"),port);
|
||||
break;
|
||||
}
|
||||
@@ -602,7 +609,7 @@ namespace System.Data.Common
|
||||
}
|
||||
}
|
||||
|
||||
internal string InstanceName
|
||||
protected virtual string InstanceName
|
||||
{
|
||||
get {
|
||||
string dataSource = ConnectionStringHelper.FindValue(UserParameters,StringManager.GetStringArray("CON_DATA_SOURCE"));
|
||||
|
||||
@@ -1,8 +1,3 @@
|
||||
2005-14-12 Konstantin Triger <[email protected]>
|
||||
|
||||
* DbPortResolver.cs, AbstractDBConnection.cs: differentiate between the situation where
|
||||
don't have a response and where instance name does not exist.
|
||||
|
||||
2005-14-12 Konstantin Triger <[email protected]>
|
||||
|
||||
* DbPortResolver.cs: fix port resolution for unnamed instances.
|
||||
|
||||
@@ -36,12 +36,10 @@ using java.net;
|
||||
|
||||
namespace System.Data.Common
|
||||
{
|
||||
internal sealed class DbPortResolver
|
||||
public class DbPortResolver
|
||||
{
|
||||
public static int getMSSqlPort(AbstractDBConnection connection)
|
||||
public static int getMSSqlPort(String sqlName, String instanceName,int timeout)
|
||||
{
|
||||
String instanceName = connection.InstanceName;
|
||||
int timeout = connection.ConnectionTimeout;
|
||||
int port = -1;
|
||||
try
|
||||
{
|
||||
@@ -49,7 +47,7 @@ namespace System.Data.Common
|
||||
|
||||
// send request
|
||||
sbyte[] buf = new sbyte[] {2};
|
||||
InetAddress address = InetAddress.getByName(connection.DataSource);
|
||||
InetAddress address = InetAddress.getByName(sqlName);
|
||||
DatagramPacket packet = new DatagramPacket(buf, buf.Length, address, 1434);
|
||||
socket.send(packet);
|
||||
sbyte[] recbuf = new sbyte[1024];
|
||||
@@ -58,7 +56,8 @@ namespace System.Data.Common
|
||||
// try to receive from socket while increasing timeouts in geometric progression
|
||||
int iterationTimeout = 1;
|
||||
int totalTimeout = 0;
|
||||
for(;;) {
|
||||
while (totalTimeout < timeout*1000)
|
||||
{
|
||||
socket.setSoTimeout(iterationTimeout);
|
||||
try
|
||||
{
|
||||
@@ -69,11 +68,6 @@ namespace System.Data.Common
|
||||
{
|
||||
totalTimeout += iterationTimeout;
|
||||
iterationTimeout *= 2;
|
||||
if (totalTimeout >= timeout*1000) {
|
||||
throw new java.sql.SQLException(
|
||||
String.Format ("Unable to retrieve the port number for {0} using UDP on port 1434. Please see your network administrator to solve this problem or add the port number of your SQL server instance to your connection string (i.e. port=1433).", connection.DataSource)
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
sbyte[] rcvdSbytes = packet.getData();
|
||||
@@ -110,19 +104,12 @@ namespace System.Data.Common
|
||||
prev = st.nextToken();
|
||||
}
|
||||
socket.close();
|
||||
|
||||
if (!instanceReached)
|
||||
throw new java.sql.SQLException(
|
||||
String.Format ("Specified SQL Server '{0}\\{1}' not found.", connection.DataSource, instanceName)
|
||||
);
|
||||
return port;
|
||||
|
||||
}
|
||||
catch (java.sql.SQLException) {
|
||||
throw;
|
||||
}
|
||||
catch (Exception e) {
|
||||
throw new java.sql.SQLException(e.Message);
|
||||
catch (java.lang.Exception e)
|
||||
{
|
||||
return port;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,7 +1,3 @@
|
||||
2005-12-15 Konstantin Triger <[email protected]>
|
||||
|
||||
* SqlConnection.cs: save StringManager into AppDomain.
|
||||
|
||||
2005-16-11 Boris Kirzner <[email protected]>
|
||||
* SqlConnection.cs: Added override for CreateException().
|
||||
|
||||
|
||||
@@ -45,8 +45,7 @@ namespace System.Data.SqlClient
|
||||
|
||||
protected static Hashtable _skippedUserParameters = new Hashtable(new CaseInsensitiveHashCodeProvider(),new CaseInsensitiveComparer());
|
||||
|
||||
private static readonly object _lockObjectStringManager = new object();
|
||||
//private static DbStringManager _stringManager = new DbStringManager("System.Data.System.Data.ProviderBase.jvm.SqlClientStrings");
|
||||
private static DbStringManager _stringManager = new DbStringManager("System.Data.System.Data.ProviderBase.jvm.SqlClientStrings");
|
||||
|
||||
private static readonly string[] _resourceIgnoredKeys = new string[] {"CON_DATA_SOURCE","CON_DATABASE",
|
||||
"CON_PASSWORD","CON_USER_ID","CON_TIMEOUT",
|
||||
@@ -143,20 +142,7 @@ namespace System.Data.SqlClient
|
||||
|
||||
protected override DbStringManager StringManager
|
||||
{
|
||||
get {
|
||||
const string stringManagerName = "System.Data.OleDbConnection.stringManager";
|
||||
object stringManager = AppDomain.CurrentDomain.GetData(stringManagerName);
|
||||
if (stringManager == null) {
|
||||
lock(_lockObjectStringManager) {
|
||||
stringManager = AppDomain.CurrentDomain.GetData(stringManagerName);
|
||||
if (stringManager != null)
|
||||
return (DbStringManager)stringManager;
|
||||
stringManager = new DbStringManager("System.Data.System.Data.ProviderBase.jvm.SqlClientStrings");
|
||||
AppDomain.CurrentDomain.SetData(stringManagerName, stringManager);
|
||||
}
|
||||
}
|
||||
return (DbStringManager)stringManager;
|
||||
}
|
||||
get { return _stringManager; }
|
||||
}
|
||||
|
||||
#endregion // Properties
|
||||
|
||||
@@ -1,12 +1,3 @@
|
||||
2005-12-12 Konstantin Triger <[email protected]>
|
||||
|
||||
* DataRow.cs: Added index Updates.
|
||||
EndEdit() fixed to first update indices and then AssertConstraints
|
||||
based on those indices.
|
||||
Added Validate() and AssertConstraints() functions.
|
||||
* DataRowCollection.cs: Removed ValidateDataRowInternal().
|
||||
* DataTable: Fixed Clear().
|
||||
|
||||
2005-12-06 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* CustomDataClassGenerator.cs : (InitializeFields) handle AllowDBNull
|
||||
|
||||
@@ -592,17 +592,12 @@ namespace System.Data {
|
||||
return;
|
||||
case DataRowState.Added:
|
||||
case DataRowState.Modified:
|
||||
int original = Original;
|
||||
DataRowState oldState = RowState;
|
||||
if (Original >= 0) {
|
||||
Table.RecordCache.DisposeRecord(Original);
|
||||
}
|
||||
Original = Current;
|
||||
foreach (Index index in Table.Indexes)
|
||||
index.Update(this, original, DataRowVersion.Original, oldState);
|
||||
break;
|
||||
case DataRowState.Deleted:
|
||||
Table.DeleteRowFromIndexes(this);
|
||||
_table.Rows.RemoveInternal (this);
|
||||
DetachRow();
|
||||
break;
|
||||
@@ -643,13 +638,12 @@ namespace System.Data {
|
||||
}
|
||||
|
||||
if (HasVersion (DataRowVersion.Proposed)) {
|
||||
int oldRecord = Proposed;
|
||||
DataRowState oldState = RowState;
|
||||
Table.RecordCache.DisposeRecord(Proposed);
|
||||
Proposed = -1;
|
||||
|
||||
int newVersion = (HasVersion (DataRowVersion.Current)) ? Current : Original;
|
||||
foreach(Index index in Table.Indexes)
|
||||
index.Update(this,oldRecord, DataRowVersion.Proposed, oldState);
|
||||
index.Update(this,newVersion);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -685,17 +679,14 @@ namespace System.Data {
|
||||
default:
|
||||
// check what to do with child rows
|
||||
CheckChildRows(DataRowAction.Delete);
|
||||
_table.DeleteRowFromIndexes (this);
|
||||
break;
|
||||
}
|
||||
if (Current >= 0) {
|
||||
int current = Current;
|
||||
DataRowState oldState = RowState;
|
||||
if (Current != Original) {
|
||||
_table.RecordCache.DisposeRecord(Current);
|
||||
}
|
||||
Current = -1;
|
||||
foreach(Index index in Table.Indexes)
|
||||
index.Update(this, current, DataRowVersion.Current, oldState);
|
||||
}
|
||||
_table.DeletedDataRow(this, DataRowAction.Delete);
|
||||
}
|
||||
@@ -852,46 +843,38 @@ namespace System.Data {
|
||||
_inChangingEvent = false;
|
||||
}
|
||||
|
||||
DataRowState oldState = RowState;
|
||||
//Calling next method validates UniqueConstraints
|
||||
//and ForeignKeys.
|
||||
bool rowValidated = false;
|
||||
try
|
||||
{
|
||||
if ((_table.DataSet == null || _table.DataSet.EnforceConstraints) && !_table._duringDataLoad) {
|
||||
_table.Rows.ValidateDataRowInternal(this);
|
||||
rowValidated = true;
|
||||
}
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Table.RecordCache.DisposeRecord(Proposed);
|
||||
Proposed = -1;
|
||||
throw e;
|
||||
}
|
||||
|
||||
CheckChildRows(DataRowAction.Change);
|
||||
if (Original != Current) {
|
||||
Table.RecordCache.DisposeRecord(Current);
|
||||
}
|
||||
|
||||
int oldRecord = Current;
|
||||
Current = Proposed;
|
||||
Proposed = -1;
|
||||
|
||||
if (!Table._duringDataLoad) {
|
||||
if (!rowValidated) {
|
||||
// keep indexes updated even if there was no need to validate row
|
||||
foreach(Index index in Table.Indexes) {
|
||||
index.Update(this,oldRecord, DataRowVersion.Current, oldState);
|
||||
index.Update(this,Current); //FIXME: why Current ?!
|
||||
}
|
||||
}
|
||||
|
||||
try {
|
||||
AssertConstraints();
|
||||
|
||||
// restore previous state to let the cascade update to find the rows
|
||||
Proposed = Current;
|
||||
Current = oldRecord;
|
||||
|
||||
CheckChildRows(DataRowAction.Change);
|
||||
|
||||
// apply new state
|
||||
Current = Proposed;
|
||||
Proposed = -1;
|
||||
}
|
||||
catch {
|
||||
int proposed = Proposed >= 0 ? Proposed : Current;
|
||||
Current = oldRecord;
|
||||
if (!Table._duringDataLoad) {
|
||||
foreach(Index index in Table.Indexes) {
|
||||
index.Update(this,proposed, DataRowVersion.Current, RowState);
|
||||
}
|
||||
}
|
||||
throw;
|
||||
}
|
||||
|
||||
if (Original != oldRecord) {
|
||||
Table.RecordCache.DisposeRecord(oldRecord);
|
||||
}
|
||||
|
||||
// Note : row state must not be changed before all the job on indexes finished,
|
||||
// since the indexes works with recods rather than with rows and the decision
|
||||
// which of row records to choose depends on row state.
|
||||
@@ -1321,7 +1304,10 @@ namespace System.Data {
|
||||
CheckChildRows(DataRowAction.Rollback);
|
||||
|
||||
if (Current != Original) {
|
||||
Table.DeleteRowFromIndexes(this);
|
||||
foreach(Index index in Table.Indexes) {
|
||||
index.Delete (this);
|
||||
index.Update(this,Original);
|
||||
}
|
||||
Current = Original;
|
||||
}
|
||||
|
||||
@@ -1334,9 +1320,12 @@ namespace System.Data {
|
||||
_table.Rows.RemoveInternal (this);
|
||||
break;
|
||||
case DataRowState.Modified:
|
||||
if ((_table.DataSet == null || _table.DataSet.EnforceConstraints) && !_table._duringDataLoad)
|
||||
_table.Rows.ValidateDataRowInternal(this);
|
||||
break;
|
||||
case DataRowState.Deleted:
|
||||
Table.AddRowToIndexes(this);
|
||||
AssertConstraints();
|
||||
if ((_table.DataSet == null || _table.DataSet.EnforceConstraints) && !_table._duringDataLoad)
|
||||
_table.Rows.ValidateDataRowInternal(this);
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -1635,35 +1624,6 @@ namespace System.Data {
|
||||
}
|
||||
}
|
||||
|
||||
internal void Validate() {
|
||||
Table.AddRowToIndexes(this);
|
||||
AssertConstraints();
|
||||
}
|
||||
|
||||
void AssertConstraints() {
|
||||
if (Table == null || Table._duringDataLoad)
|
||||
return;
|
||||
|
||||
if (Table.DataSet != null && !Table.DataSet.EnforceConstraints)
|
||||
return;
|
||||
|
||||
foreach(DataColumn column in Table.Columns) {
|
||||
if (!column.AllowDBNull && IsNull(column)) {
|
||||
throw new NoNullAllowedException(_nullConstraintMessage);
|
||||
}
|
||||
}
|
||||
|
||||
foreach(Constraint constraint in Table.Constraints) {
|
||||
try {
|
||||
constraint.AssertConstraint(this);
|
||||
}
|
||||
catch(Exception e) {
|
||||
Table.DeleteRowFromIndexes(this);
|
||||
throw e;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
internal void CheckNullConstraints()
|
||||
{
|
||||
if (_nullConstraintViolation) {
|
||||
@@ -1705,15 +1665,17 @@ namespace System.Data {
|
||||
&& RowState == DataRowState.Unchanged)) {
|
||||
Table.ChangingDataRow (this, DataRowAction.ChangeCurrentAndOriginal);
|
||||
temp = Table.CreateRecord (values);
|
||||
Table.DeleteRowFromIndexes(this);
|
||||
if (HasVersion (DataRowVersion.Original) && Current != Original)
|
||||
Table.RecordCache.DisposeRecord (Original);
|
||||
Original = temp;
|
||||
// update the pk index
|
||||
index = Table.GetIndex(Table.PrimaryKey,null,DataViewRowState.None,null,false);
|
||||
if (index != null)
|
||||
index.Update (this, temp);
|
||||
|
||||
if (HasVersion (DataRowVersion.Current))
|
||||
Table.RecordCache.DisposeRecord (Current);
|
||||
Current = temp;
|
||||
Table.AddRowToIndexes(this);
|
||||
Table.ChangedDataRow (this, DataRowAction.ChangeCurrentAndOriginal);
|
||||
return;
|
||||
}
|
||||
@@ -1735,16 +1697,19 @@ namespace System.Data {
|
||||
if (RowState == DataRowState.Added
|
||||
|| Table.CompareRecords (rindex, temp) != 0) {
|
||||
Table.ChangingDataRow (this, DataRowAction.Change);
|
||||
Table.DeleteRowFromIndexes(this);
|
||||
if (HasVersion (DataRowVersion.Proposed)) {
|
||||
Table.RecordCache.DisposeRecord (Proposed);
|
||||
Proposed = -1;
|
||||
}
|
||||
|
||||
|
||||
// update the pk index
|
||||
index = Table.GetIndex(Table.PrimaryKey,null,DataViewRowState.None,null,false);
|
||||
if (index != null)
|
||||
index.Update (this, temp);
|
||||
|
||||
if (Original != Current)
|
||||
Table.RecordCache.DisposeRecord (Current);
|
||||
Current = temp;
|
||||
Table.AddRowToIndexes(this);
|
||||
Table.ChangedDataRow (this, DataRowAction.Change);
|
||||
} else {
|
||||
Table.ChangingDataRow (this, DataRowAction.Nothing);
|
||||
|
||||
@@ -95,7 +95,9 @@ namespace System.Data
|
||||
|
||||
row.BeginEdit();
|
||||
|
||||
row.Validate();
|
||||
if (!table._duringDataLoad)
|
||||
// we have to check that the new row doesn't colide with existing row
|
||||
ValidateDataRowInternal(row);
|
||||
|
||||
AddInternal(row);
|
||||
}
|
||||
@@ -122,8 +124,9 @@ namespace System.Data
|
||||
DataRow row = table.NewNotInitializedRow();
|
||||
int newRecord = table.CreateRecord(values);
|
||||
row.ImportRecord(newRecord);
|
||||
|
||||
row.Validate();
|
||||
if ((table.DataSet == null || table.DataSet.EnforceConstraints) && !table._duringDataLoad)
|
||||
// we have to check that the new row doesn't colide with existing row
|
||||
ValidateDataRowInternal(row);
|
||||
AddInternal (row);
|
||||
return row;
|
||||
}
|
||||
@@ -274,7 +277,9 @@ namespace System.Data
|
||||
if (row.RowID != -1)
|
||||
throw new ArgumentException ("This row already belongs to this table.");
|
||||
|
||||
row.Validate();
|
||||
if ((table.DataSet == null || table.DataSet.EnforceConstraints) && !table._duringDataLoad)
|
||||
// we have to check that the new row doesn't colide with existing row
|
||||
ValidateDataRowInternal(row);
|
||||
|
||||
row.Table.ChangingDataRow (row, DataRowAction.Add);
|
||||
|
||||
@@ -335,5 +340,41 @@ namespace System.Data
|
||||
{
|
||||
Remove(this[index]);
|
||||
}
|
||||
|
||||
///<summary>
|
||||
///Internal method used to validate a given DataRow with respect
|
||||
///to the DataRowCollection
|
||||
///</summary>
|
||||
[MonoTODO]
|
||||
internal void ValidateDataRowInternal(DataRow row)
|
||||
{
|
||||
int newRecord = (row.Proposed >= 0) ? row.Proposed : row.Current;
|
||||
if (newRecord < 0)
|
||||
return;
|
||||
|
||||
foreach(Index index in table.Indexes) {
|
||||
index.Update(row,newRecord);
|
||||
}
|
||||
|
||||
if (!(table.DataSet == null || table.DataSet.EnforceConstraints))
|
||||
return;
|
||||
|
||||
//first check for null violations.
|
||||
row._nullConstraintViolation = true;
|
||||
row.CheckNullConstraints();
|
||||
|
||||
foreach(Constraint constraint in table.Constraints) {
|
||||
try {
|
||||
constraint.AssertConstraint(row);
|
||||
}
|
||||
catch(Exception e) {
|
||||
// remove row from indexes
|
||||
foreach(Index index in table.Indexes) {
|
||||
index.Delete(newRecord);
|
||||
}
|
||||
throw e;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -713,8 +713,6 @@ namespace System.Data {
|
||||
public void Clear () {
|
||||
// Foriegn key constraints are checked in _rows.Clear method
|
||||
_rows.Clear ();
|
||||
foreach(Index index in Indexes)
|
||||
index.Reset();
|
||||
#if NET_2_0
|
||||
OnTableCleared (new DataTableClearEventArgs (this));
|
||||
#endif // NET_2_0
|
||||
@@ -1020,7 +1018,9 @@ namespace System.Data {
|
||||
}
|
||||
}
|
||||
|
||||
newRow.Validate();
|
||||
if (EnforceConstraints)
|
||||
// we have to check that the new row doesn't colide with existing row
|
||||
Rows.ValidateDataRowInternal(newRow);
|
||||
|
||||
Rows.AddInternal(newRow);
|
||||
|
||||
@@ -1175,8 +1175,11 @@ namespace System.Data {
|
||||
row.AcceptChanges();
|
||||
}
|
||||
|
||||
if (shouldUpdateIndex && !fAcceptChanges) {
|
||||
AddRowToIndexes(row);
|
||||
if (shouldUpdateIndex || !fAcceptChanges) {
|
||||
// AcceptChanges not always updates indexes because it calls EndEdit
|
||||
foreach(Index index in Indexes) {
|
||||
index.Update(row,tmpRecord);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1219,7 +1222,9 @@ namespace System.Data {
|
||||
row = NewNotInitializedRow ();
|
||||
row.ImportRecord (CreateRecord(values));
|
||||
|
||||
row.Validate(); // this adds to index ;-)
|
||||
if (EnforceConstraints)
|
||||
// we have to check that the new row doesn't colide with existing row
|
||||
Rows.ValidateDataRowInternal(row); // this adds to index ;-)
|
||||
|
||||
if (loadOption == LoadOption.OverwriteChanges ||
|
||||
loadOption == LoadOption.PreserveChanges) {
|
||||
@@ -1583,14 +1588,6 @@ namespace System.Data {
|
||||
}
|
||||
}
|
||||
|
||||
internal void AddRowToIndexes (DataRow row) {
|
||||
if (_indexes != null) {
|
||||
foreach (Index indx in _indexes) {
|
||||
indx.Add (row);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
internal void DeleteRowFromIndexes (DataRow row)
|
||||
{
|
||||
if (_indexes != null) {
|
||||
|
||||
@@ -1,10 +1,3 @@
|
||||
2005-12-20 Senganal T <[email protected]>
|
||||
* DataColumnTest.cs : added testcase for #77025
|
||||
|
||||
2005-12-15 Konstantin Triger <[email protected]>
|
||||
|
||||
* DataTableTest.cs: added SelectRowState test.
|
||||
|
||||
2005-12-07 Boris Kirzner <[email protected]>
|
||||
* DataTableTest.cs: added ifdef for feature not supported in TARGET_JVM.
|
||||
|
||||
|
||||
@@ -599,21 +599,5 @@ namespace MonoTests.System.Data
|
||||
|
||||
}
|
||||
|
||||
// Testcase for #77025
|
||||
[Test]
|
||||
public void CalcStatisticalFunction_SingleElement()
|
||||
{
|
||||
DataTable table = new DataTable ();
|
||||
table.Columns.Add ("test", typeof (int));
|
||||
|
||||
table.Rows.Add (new object [] {0});
|
||||
table.Columns.Add ("result_var", typeof (double), "var(test)");
|
||||
table.Columns.Add ("result_stdev", typeof (double), "stdev(test)");
|
||||
|
||||
// Check DBNull.Value is set as the result
|
||||
AssertEquals ("#1" , typeof (DBNull), (table.Rows[0]["result_var"]).GetType ());
|
||||
AssertEquals ("#2" , typeof (DBNull), (table.Rows[0]["result_stdev"]).GetType ());
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@@ -720,19 +720,6 @@ namespace MonoTests.System.Data
|
||||
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void SelectRowState()
|
||||
{
|
||||
DataTable d = new DataTable();
|
||||
d.Columns.Add (new DataColumn ("aaa"));
|
||||
DataRow [] rows = d.Select (null, null, DataViewRowState.Deleted);
|
||||
AssertEquals(0, rows.Length);
|
||||
d.Rows.Add (new object [] {"bbb"});
|
||||
d.Rows.Add (new object [] {"bbb"});
|
||||
rows = d.Select (null, null, DataViewRowState.Deleted);
|
||||
AssertEquals(0, rows.Length);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void ToStringTest()
|
||||
{
|
||||
|
||||
@@ -39,7 +39,6 @@ namespace System.Drawing.Drawing2D
|
||||
/// <summary>
|
||||
/// Summary description for AdjustableArrowCap.
|
||||
/// </summary>
|
||||
[MonoTODO]
|
||||
public sealed class AdjustableArrowCap : CustomLineCap
|
||||
{
|
||||
// Constructors
|
||||
@@ -48,14 +47,13 @@ namespace System.Drawing.Drawing2D
|
||||
{
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public AdjustableArrowCap (float width, float height, bool isFilled)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
// Public Properities
|
||||
[MonoTODO]
|
||||
|
||||
public bool Filled {
|
||||
get {
|
||||
throw new NotImplementedException();
|
||||
@@ -66,7 +64,6 @@ namespace System.Drawing.Drawing2D
|
||||
}
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public float Width {
|
||||
get {
|
||||
throw new NotImplementedException();
|
||||
@@ -77,7 +74,6 @@ namespace System.Drawing.Drawing2D
|
||||
}
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public float Height {
|
||||
get {
|
||||
throw new NotImplementedException();
|
||||
@@ -88,7 +84,6 @@ namespace System.Drawing.Drawing2D
|
||||
}
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public float MiddleInset {
|
||||
get {
|
||||
throw new NotImplementedException();
|
||||
|
||||
@@ -38,9 +38,6 @@ namespace System.Drawing.Drawing2D
|
||||
/// <summary>
|
||||
/// Summary description for Blend.
|
||||
/// </summary>
|
||||
#if TARGET_JVM
|
||||
[MonoTODO]
|
||||
#endif
|
||||
public sealed class Blend
|
||||
{
|
||||
private float [] positions;
|
||||
|
||||
@@ -46,14 +46,12 @@ namespace System.Drawing.Drawing2D
|
||||
colors = new Color [1];
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public ColorBlend (int count)
|
||||
{
|
||||
positions = new float [count];
|
||||
colors = new Color [count];
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public Color [] Colors {
|
||||
get {
|
||||
return colors;
|
||||
@@ -64,7 +62,6 @@ namespace System.Drawing.Drawing2D
|
||||
}
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public float [] Positions {
|
||||
get {
|
||||
return positions;
|
||||
|
||||
@@ -40,7 +40,6 @@ namespace System.Drawing.Drawing2D
|
||||
/// <summary>
|
||||
/// Summary description for CustomLineCap.
|
||||
/// </summary>
|
||||
[MonoTODO]
|
||||
public class CustomLineCap : MarshalByRefObject, ICloneable
|
||||
{
|
||||
private bool disposed;
|
||||
@@ -57,13 +56,11 @@ namespace System.Drawing.Drawing2D
|
||||
{
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public CustomLineCap(GraphicsPath fillPath, GraphicsPath strokePath, LineCap baseCap, float baseInset)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public LineCap BaseCap {
|
||||
get {
|
||||
throw new NotImplementedException();
|
||||
@@ -74,7 +71,6 @@ namespace System.Drawing.Drawing2D
|
||||
}
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public LineJoin StrokeJoin {
|
||||
get {
|
||||
throw new NotImplementedException();
|
||||
@@ -85,7 +81,6 @@ namespace System.Drawing.Drawing2D
|
||||
}
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public float BaseInset {
|
||||
get {
|
||||
throw new NotImplementedException();
|
||||
@@ -96,7 +91,6 @@ namespace System.Drawing.Drawing2D
|
||||
}
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public float WidthScale {
|
||||
get {
|
||||
throw new NotImplementedException();
|
||||
@@ -108,19 +102,18 @@ namespace System.Drawing.Drawing2D
|
||||
}
|
||||
|
||||
// Public Methods
|
||||
[MonoTODO]
|
||||
|
||||
public virtual object Clone ()
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
|
||||
public void GetStrokeCaps (out LineCap startCap, out LineCap endCap)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public void SetStrokeCaps(LineCap startCap, LineCap endCap)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
|
||||
@@ -6,7 +6,6 @@ namespace System.Drawing.Drawing2D
|
||||
/// <summary>
|
||||
/// Summary description for HatchBrush.
|
||||
/// </summary>
|
||||
[MonoTODO]
|
||||
public sealed class HatchBrush : Brush
|
||||
{
|
||||
private HatchStyle _style;
|
||||
|
||||
@@ -175,7 +175,6 @@ namespace System.Drawing.Drawing2D {
|
||||
#region Public Properties
|
||||
|
||||
// FALLBACK: no functionality implemented for this property
|
||||
[MonoTODO]
|
||||
public Blend Blend {
|
||||
get {
|
||||
return _blend;
|
||||
@@ -186,7 +185,6 @@ namespace System.Drawing.Drawing2D {
|
||||
}
|
||||
|
||||
// FALLBACK: no functionality implemented for this property
|
||||
[MonoTODO]
|
||||
public bool GammaCorrection {
|
||||
get {
|
||||
return _gammaCorrection;
|
||||
@@ -197,7 +195,6 @@ namespace System.Drawing.Drawing2D {
|
||||
}
|
||||
|
||||
// FALLBACK: functionality of two color gradient is implemented
|
||||
[MonoTODO]
|
||||
public ColorBlend InterpolationColors {
|
||||
get {
|
||||
return _interpolationColors;
|
||||
@@ -246,7 +243,6 @@ namespace System.Drawing.Drawing2D {
|
||||
}
|
||||
|
||||
// FALLBACK: not functionality implemented for this property
|
||||
[MonoTODO]
|
||||
public WrapMode WrapMode {
|
||||
get {
|
||||
return _wrapmode;
|
||||
@@ -302,7 +298,6 @@ namespace System.Drawing.Drawing2D {
|
||||
SetSigmaBellShape (focus, 1.0F);
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public void SetSigmaBellShape (float focus, float scale) {
|
||||
// FALLBACK: Triangle shape used
|
||||
SetBlendTriangularShape (focus, scale);
|
||||
|
||||
@@ -9,7 +9,6 @@ namespace System.Drawing.Drawing2D {
|
||||
/// <summary>
|
||||
/// Summary description for PathGradientBrush.
|
||||
/// </summary>
|
||||
[MonoTODO]
|
||||
public sealed class PathGradientBrush : Brush {
|
||||
Brush _nativeObject;
|
||||
Blend _blend;
|
||||
@@ -122,7 +121,6 @@ namespace System.Drawing.Drawing2D {
|
||||
|
||||
#region Properties
|
||||
|
||||
[MonoTODO]
|
||||
public Blend Blend {
|
||||
get {
|
||||
return _blend;
|
||||
@@ -249,7 +247,6 @@ namespace System.Drawing.Drawing2D {
|
||||
SetSigmaBellShape (focus, 1.0F);
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public void SetSigmaBellShape (float focus, float scale) {
|
||||
// FALLBACK: Triangle shape used
|
||||
SetBlendTriangularShape (focus, scale);
|
||||
|
||||
@@ -38,9 +38,6 @@ using System.IO;
|
||||
namespace System.Drawing.Imaging
|
||||
{
|
||||
// MUST BE KEPT IN SYNC WITH gdip.h in libgdiplus!
|
||||
#if TARGET_JVM
|
||||
[MonoTODO]
|
||||
#endif
|
||||
[StructLayout(LayoutKind.Sequential)]
|
||||
public sealed class BitmapData {
|
||||
internal int width;
|
||||
|
||||
@@ -37,9 +37,7 @@ using System.IO;
|
||||
using System.Reflection;
|
||||
|
||||
namespace System.Drawing.Imaging {
|
||||
#if TARGET_JVM
|
||||
[MonoTODO]
|
||||
#endif
|
||||
|
||||
public sealed class ColorMap {
|
||||
|
||||
private Color newColor;
|
||||
|
||||
@@ -38,9 +38,6 @@ using System.Runtime.InteropServices;
|
||||
|
||||
namespace System.Drawing.Imaging
|
||||
{
|
||||
#if TARGET_JVM
|
||||
[MonoTODO]
|
||||
#endif
|
||||
[StructLayout (LayoutKind.Sequential)]
|
||||
public sealed class ColorMatrix
|
||||
{
|
||||
|
||||
@@ -38,7 +38,6 @@ using System.Runtime.InteropServices;
|
||||
|
||||
namespace System.Drawing.Imaging {
|
||||
|
||||
[MonoTODO]
|
||||
public sealed class EncoderParameter : IDisposable {
|
||||
|
||||
private Encoder encoder;
|
||||
@@ -49,97 +48,82 @@ namespace System.Drawing.Imaging {
|
||||
{
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public EncoderParameter (Encoder encoder, byte value)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public EncoderParameter (Encoder encoder, byte[] value)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public EncoderParameter (Encoder encoder, short value)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public EncoderParameter (Encoder encoder, short[] value)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
|
||||
public EncoderParameter (Encoder encoder, long value)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public EncoderParameter (Encoder encoder, long[] value)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public EncoderParameter (Encoder encoder, string value)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public EncoderParameter (Encoder encoder, byte value, bool undefined)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public EncoderParameter (Encoder encoder, byte[] value, bool undefined)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public EncoderParameter (Encoder encoder, int numerator, int denominator)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public EncoderParameter (Encoder encoder, int[] numerator, int[] denominator)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public EncoderParameter (Encoder encoder, long rangebegin, long rangeend)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public EncoderParameter (Encoder encoder, long[] rangebegin, long[] rangeend)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public EncoderParameter (Encoder encoder, int numberOfValues, int type, int value)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public EncoderParameter (Encoder encoder, int numerator1, int denominator1, int numerator2, int denominator2)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public EncoderParameter (Encoder encoder, int[] numerator1, int[] denominator1, int[] numerator2, int[] denominator2)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
|
||||
@@ -9,10 +9,9 @@ namespace System.Drawing.Imaging
|
||||
/// Summary description for ImageAttributes.
|
||||
/// </summary>
|
||||
///
|
||||
[MonoTODO]
|
||||
public sealed class ImageAttributes : ICloneable, IDisposable
|
||||
{
|
||||
[MonoTODO]
|
||||
|
||||
public ImageAttributes()
|
||||
{
|
||||
}
|
||||
@@ -21,6 +20,12 @@ namespace System.Drawing.Imaging
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
public void Finalize()
|
||||
{
|
||||
Dispose();
|
||||
}
|
||||
|
||||
public Object Clone()
|
||||
{
|
||||
ImageAttributes imgAttr = new ImageAttributes();
|
||||
|
||||
@@ -378,7 +378,7 @@ namespace Mainsoft.Drawing.Imaging {
|
||||
|
||||
#region Image read/write methods
|
||||
|
||||
internal PlainImage ReadPlainImage() {
|
||||
public PlainImage ReadPlainImage() {
|
||||
awt.Image img = ReadImage( _currentFrame );
|
||||
if (img == null)
|
||||
return null;
|
||||
@@ -407,7 +407,7 @@ namespace Mainsoft.Drawing.Imaging {
|
||||
return pi;
|
||||
}
|
||||
|
||||
internal PlainImage ReadNextPlainImage() {
|
||||
public PlainImage ReadNextPlainImage() {
|
||||
_currentFrame++;
|
||||
return ReadPlainImage();
|
||||
}
|
||||
@@ -450,7 +450,7 @@ namespace Mainsoft.Drawing.Imaging {
|
||||
}
|
||||
}
|
||||
#endif
|
||||
internal void WritePlainImage(PlainImageCollection pic) {
|
||||
public void WritePlainImage(PlainImageCollection pic) {
|
||||
if ((pic == null) || (pic.Count == 0))
|
||||
return;
|
||||
|
||||
@@ -476,7 +476,7 @@ namespace Mainsoft.Drawing.Imaging {
|
||||
}
|
||||
}
|
||||
|
||||
internal void WritePlainImage(PlainImage pi) {
|
||||
public void WritePlainImage(PlainImage pi) {
|
||||
try {
|
||||
imageio.IIOImage iio = GetIIOImageContainer( pi );
|
||||
WriteImage( iio );
|
||||
|
||||
@@ -42,244 +42,203 @@ namespace System.Drawing.Imaging {
|
||||
#if SYSTEM_DRAWING_DESIGN_SUPPORT
|
||||
[Editor ("System.Drawing.Design.MetafileEditor, " + Consts.AssemblySystem_Drawing_Design, typeof (System.Drawing.Design.UITypeEditor))]
|
||||
#endif
|
||||
[MonoTODO]
|
||||
public sealed class Metafile : Image {
|
||||
|
||||
// constructors
|
||||
[MonoTODO]
|
||||
public Metafile (Stream stream)
|
||||
{
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public Metafile (string filename)
|
||||
{
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
|
||||
#if INTPTR_SUPPORT
|
||||
|
||||
[MonoTODO]
|
||||
public Metafile (IntPtr henhmetafile, bool deleteEmf)
|
||||
{
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public Metafile (IntPtr referenceHtc, EmfType emfType)
|
||||
{
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public Metafile (IntPtr referenceHtc, Rectangle frameRect)
|
||||
{
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public Metafile (IntPtr referenceHtc, RectangleF frameRect)
|
||||
{
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public Metafile (IntPtr hmetafile, WmfPlaceableFileHeader wmfHeader)
|
||||
{
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public Metafile (Stream stream, IntPtr referenceHtc)
|
||||
{
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public Metafile (String fileName, IntPtr referenceHtc)
|
||||
{
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public Metafile (IntPtr referenceHdc, EmfType emfType, string description)
|
||||
{
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public Metafile (IntPtr referenceHdc, Rectangle frameRect, MetafileFrameUnit frameUnit)
|
||||
{
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public Metafile (IntPtr referenceHdc, RectangleF frameRect, MetafileFrameUnit frameUnit)
|
||||
{
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public Metafile (IntPtr hmetafile, WmfPlaceableFileHeader wmfHeader, bool deleteWmf)
|
||||
{
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public Metafile (Stream stream, IntPtr referenceHdc, EmfType type)
|
||||
{
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public Metafile (Stream stream, IntPtr referenceHdc, Rectangle frameRect)
|
||||
{
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public Metafile (Stream stream, IntPtr referenceHdc, RectangleF frameRect)
|
||||
{
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public Metafile (string fileName, IntPtr referenceHdc, EmfType type)
|
||||
{
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public Metafile (string fileName, IntPtr referenceHdc, Rectangle frameRect)
|
||||
{
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public Metafile (string fileName, IntPtr referenceHdc, RectangleF frameRect)
|
||||
{
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public Metafile (IntPtr referenceHdc, Rectangle frameRect, MetafileFrameUnit frameUnit, EmfType type)
|
||||
{
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public Metafile (IntPtr referenceHdc, RectangleF frameRect, MetafileFrameUnit frameUnit, EmfType type)
|
||||
{
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public Metafile (Stream stream, IntPtr referenceHtc, EmfType type, string description)
|
||||
{
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public Metafile (Stream stream, IntPtr referenceHdc, Rectangle frameRect, MetafileFrameUnit frameUnit)
|
||||
{
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public Metafile (Stream stream, IntPtr referenceHdc, RectangleF frameRect, MetafileFrameUnit frameUnit)
|
||||
{
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public Metafile (string fileName, IntPtr referenceHdc, EmfType type, string description)
|
||||
{
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public Metafile (string fileName, IntPtr referenceHdc, Rectangle frameRect, MetafileFrameUnit frameUnit)
|
||||
{
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public Metafile (string fileName, IntPtr referenceHdc, RectangleF frameRect, MetafileFrameUnit frameUnit)
|
||||
{
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public Metafile (IntPtr referenceHdc, Rectangle frameRect, MetafileFrameUnit frameUnit, EmfType type, string description)
|
||||
{
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public Metafile (IntPtr referenceHdc, RectangleF frameRect, MetafileFrameUnit frameUnit, EmfType type, string description)
|
||||
{
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public Metafile (Stream stream, IntPtr referenceHdc, Rectangle frameRect, MetafileFrameUnit frameUnit, EmfType type)
|
||||
{
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public Metafile (Stream stream, IntPtr referenceHdc, RectangleF frameRect, MetafileFrameUnit frameUnit, EmfType type)
|
||||
{
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public Metafile (string fileName, IntPtr referenceHdc, Rectangle frameRect, MetafileFrameUnit frameUnit, EmfType type)
|
||||
{
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public Metafile (string fileName, IntPtr referenceHdc, Rectangle frameRect, MetafileFrameUnit frameUnit, string description)
|
||||
{
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public Metafile (string fileName, IntPtr referenceHdc, RectangleF frameRect, MetafileFrameUnit frameUnit, EmfType type)
|
||||
{
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public Metafile (string fileName, IntPtr referenceHdc, RectangleF frameRect, MetafileFrameUnit frameUnit, string description)
|
||||
{
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public Metafile (Stream stream, IntPtr referenceHdc, Rectangle frameRect, MetafileFrameUnit frameUnit, EmfType type,
|
||||
string description)
|
||||
{
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public Metafile (Stream stream, IntPtr referenceHdc, RectangleF frameRect, MetafileFrameUnit frameUnit, EmfType type,
|
||||
string description)
|
||||
{
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public Metafile (string fileName, IntPtr referenceHdc, Rectangle frameRect, MetafileFrameUnit frameUnit, EmfType type,
|
||||
string description)
|
||||
{
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public Metafile (string fileName, IntPtr referenceHdc, RectangleF frameRect, MetafileFrameUnit frameUnit, EmfType type,
|
||||
string description)
|
||||
{
|
||||
@@ -287,75 +246,64 @@ namespace System.Drawing.Imaging {
|
||||
}
|
||||
|
||||
// methods
|
||||
[MonoTODO]
|
||||
public IntPtr GetHenhmetafile()
|
||||
{
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
#endif
|
||||
|
||||
[MonoTODO]
|
||||
public MetafileHeader GetMetafileHeader()
|
||||
{
|
||||
throw new NotFiniteNumberException();
|
||||
}
|
||||
|
||||
#if INTPTR_SUPPORT
|
||||
[MonoTODO]
|
||||
public static MetafileHeader GetMetafileHeader(IntPtr henhmetafile)
|
||||
{
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
#endif
|
||||
[MonoTODO]
|
||||
public static MetafileHeader GetMetafileHeader(Stream stream)
|
||||
{
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public static MetafileHeader GetMetafileHeader(string fileName)
|
||||
{
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
|
||||
#if INTPTR_SUPPORT
|
||||
[MonoTODO]
|
||||
public static MetafileHeader GetMetafileHeader(IntPtr henhmetafile, WmfPlaceableFileHeader wmfHeader)
|
||||
{
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
#endif
|
||||
[MonoTODO]
|
||||
public void PlayRecord(EmfPlusRecordType recordType, int flags, int dataSize, byte[] datawmfHeader)
|
||||
{
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
// properties
|
||||
|
||||
[MonoTODO]
|
||||
protected override void InternalSave (javax.imageio.stream.ImageOutputStream output, Guid clsid) {
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
protected override PixelFormat InternalPixelFormat {
|
||||
get {
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
protected override java.awt.Image[] CloneNativeObjects(java.awt.Image[] src) {
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
protected override void InternalSave (javax.imageio.stream.ImageOutputStream output, Guid clsid) {
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
|
||||
protected override PixelFormat InternalPixelFormat {
|
||||
get {
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
}
|
||||
|
||||
protected override java.awt.Image[] CloneNativeObjects(java.awt.Image[] src) {
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
|
||||
#region Clone
|
||||
[MonoTODO]
|
||||
public override object Clone() {
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
#endregion
|
||||
#endregion
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -34,10 +34,7 @@ using System.Runtime.InteropServices;
|
||||
|
||||
namespace System.Drawing.Imaging {
|
||||
|
||||
[MonoTODO]
|
||||
#if !TARGET_JVM
|
||||
[StructLayout(LayoutKind.Sequential)]
|
||||
#endif
|
||||
public sealed class MetafileHeader
|
||||
{
|
||||
|
||||
|
||||
Loaded 100 of 345 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user