diff options
12 files changed, 277 insertions, 116 deletions
diff --git a/mcs/class/System/Microsoft.Win32/ChangeLog b/mcs/class/System/Microsoft.Win32/ChangeLog index ff621c1f43e..411cc6452a7 100644 --- a/mcs/class/System/Microsoft.Win32/ChangeLog +++ b/mcs/class/System/Microsoft.Win32/ChangeLog @@ -1,3 +1,32 @@ +2005-10-17 Sebastien Pouliot <sebastien@ximian.com> + + * PowerModeChangedEventArgs.cs: Added a LinkDemand and an + InheritanceDemand for FullTrust (i.e. Unrestricted permission set) at + the class level. + * SessionEndingEventArgs.cs: Added a LinkDemand and an + InheritanceDemand for FullTrust (i.e. Unrestricted permission set) at + the class level. + * SessionEndedEventArgs.cs: Added a LinkDemand and an + InheritanceDemand for FullTrust (i.e. Unrestricted permission set) at + the class level. + * SessionSwitchReason.cs: New. Enum for 2.0. + * SessionSwitchEventArgs.cs: New. Class for 2.0. + * SessionSwitchEventHandler.cs: New. Delegate for 2.0. + * SystemEvents.cs: Added a LinkDemand for FullTrust (i.e. Unrestricted + permission set) at the class level. Added new events + DisplaySettingsChanging and SessionSwitch (2.0). Added [Obsolete], + [Browsable] and [EditorBrowsable] on LowMemory event (2.0). + * TimerElapsedEventArgs.cs: Added a LinkDemand and an + InheritanceDemand for FullTrust (i.e. Unrestricted permission set) at + the class level. + * UserPreferenceCategory.cs: Added new VisualStyle value for 2.0. + * UserPreferenceChangedEventArgs.cs: Added a LinkDemand and an + InheritanceDemand for FullTrust (i.e. Unrestricted permission set) at + the class level. + * UserPreferenceChangingEventArgs.cs: Added a LinkDemand and an + InheritanceDemand for FullTrust (i.e. Unrestricted permission set) at + the class level. + 2003-11-12 Andreas Nahr <ClassDevelopment@A-SoftTech.com> * TimerElapsedEventArgs.cs: Added missing Attribute, restyled @@ -30,4 +59,4 @@ * UserPreferenceChangedEventHandler.cs * UserPreferenceChangingEventArgs.cs * UserPreferenceChangingEventHandler.cs: - Initial import.
\ No newline at end of file + Initial import. diff --git a/mcs/class/System/Microsoft.Win32/PowerModeChangedEventArgs.cs b/mcs/class/System/Microsoft.Win32/PowerModeChangedEventArgs.cs index 8dc25a45eee..2b9b6024a21 100644 --- a/mcs/class/System/Microsoft.Win32/PowerModeChangedEventArgs.cs +++ b/mcs/class/System/Microsoft.Win32/PowerModeChangedEventArgs.cs @@ -5,8 +5,7 @@ // Johannes Roith (johannes@jroith.de)
//
// (C) 2002 Johannes Roith
-//
- +// Copyright (C) 2005 Novell, Inc (http://www.novell.com) // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the @@ -27,11 +26,14 @@ // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // + +using System.Security.Permissions; + namespace Microsoft.Win32 {
- /// <summary>
- /// </summary>
- public class PowerModeChangedEventArgs : System.EventArgs{
+ [PermissionSet (SecurityAction.LinkDemand, Unrestricted = true)] + [PermissionSet (SecurityAction.InheritanceDemand, Unrestricted = true)] + public class PowerModeChangedEventArgs : System.EventArgs {
PowerModes mymode;
@@ -41,13 +43,9 @@ namespace Microsoft.Win32 { }
public PowerModes Mode {
-
get{
return mymode;
}
-
}
-
}
-
}
diff --git a/mcs/class/System/Microsoft.Win32/SessionEndedEventArgs.cs b/mcs/class/System/Microsoft.Win32/SessionEndedEventArgs.cs index cca6cf47ec4..edbb76d1641 100644 --- a/mcs/class/System/Microsoft.Win32/SessionEndedEventArgs.cs +++ b/mcs/class/System/Microsoft.Win32/SessionEndedEventArgs.cs @@ -5,8 +5,7 @@ // Johannes Roith (johannes@jroith.de)
//
// (C) 2002 Johannes Roith
-//
- +// Copyright (C) 2005 Novell, Inc (http://www.novell.com) // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the @@ -27,27 +26,24 @@ // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // + +using System.Security.Permissions; + namespace Microsoft.Win32 {
- /// <summary>
- /// </summary>
-public class SessionEndedEventArgs : System.EventArgs{
+ [PermissionSet (SecurityAction.LinkDemand, Unrestricted = true)] + [PermissionSet (SecurityAction.InheritanceDemand, Unrestricted = true)] + public class SessionEndedEventArgs : System.EventArgs {
- SessionEndReasons myreason;
+ SessionEndReasons myreason;
- public SessionEndedEventArgs(SessionEndReasons reason)
- {
- this.myreason = reason;
- }
+ public SessionEndedEventArgs (SessionEndReasons reason)
+ {
+ this.myreason = reason;
+ }
- public SessionEndReasons Reason {
-
- get{
- return myreason;
+ public SessionEndReasons Reason {
+ get { return myreason; }
}
-
}
-
-}
-
}
diff --git a/mcs/class/System/Microsoft.Win32/SessionEndingEventArgs.cs b/mcs/class/System/Microsoft.Win32/SessionEndingEventArgs.cs index b811cb906be..69faf7fe95e 100644 --- a/mcs/class/System/Microsoft.Win32/SessionEndingEventArgs.cs +++ b/mcs/class/System/Microsoft.Win32/SessionEndingEventArgs.cs @@ -5,8 +5,7 @@ // Johannes Roith (johannes@jroith.de)
//
// (C) 2002 Johannes Roith
-//
- +// Copyright (C) 2005 Novell, Inc (http://www.novell.com) // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the @@ -27,41 +26,30 @@ // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // + +using System.Security.Permissions; + namespace Microsoft.Win32 {
- /// <summary>
- /// </summary>
-public class SessionEndingEventArgs : System.EventArgs{
+ [PermissionSet (SecurityAction.LinkDemand, Unrestricted = true)] + [PermissionSet (SecurityAction.InheritanceDemand, Unrestricted = true)] + public class SessionEndingEventArgs : System.EventArgs {
- SessionEndReasons myreason;
- bool mycancel;
-
- public SessionEndingEventArgs(SessionEndReasons reason)
- {
- this.myreason = reason;
- }
-
- public SessionEndReasons Reason {
+ SessionEndReasons myreason;
+ bool mycancel;
- get{
- return myreason;
+ public SessionEndingEventArgs (SessionEndReasons reason)
+ {
+ this.myreason = reason;
}
-
- }
-
- public bool Cancel {
-
- get{
- return mycancel;
+ public SessionEndReasons Reason {
+ get { return myreason; }
}
- set{
- mycancel = value;
-
+
+ public bool Cancel {
+ get { return mycancel; }
+ set { mycancel = value; }
}
-
}
-
-}
-
}
diff --git a/mcs/class/System/Microsoft.Win32/SessionSwitchEventArgs.cs b/mcs/class/System/Microsoft.Win32/SessionSwitchEventArgs.cs new file mode 100644 index 00000000000..888300bf40a --- /dev/null +++ b/mcs/class/System/Microsoft.Win32/SessionSwitchEventArgs.cs @@ -0,0 +1,52 @@ +// +// Microsoft.Win32.SessionSwitchEventArgs class +// +// Author: +// Sebastien Pouliot <sebastien@ximian.com> +// +// Copyright (C) 2005 Novell, Inc (http://www.novell.com) +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// + +#if NET_2_0 + +using System.Security.Permissions; + +namespace Microsoft.Win32 { + + [PermissionSet (SecurityAction.LinkDemand, Unrestricted = true)] + [PermissionSet (SecurityAction.InheritanceDemand, Unrestricted = true)] + public class SessionSwitchEventArgs : System.EventArgs { + + SessionSwitchReason reason; + + public SessionSwitchEventArgs (SessionSwitchReason reason) + { + this.reason = reason; + } + + public SessionSwitchReason Reason { + get { return reason; } + } + } +} + +#endif diff --git a/mcs/class/System/Microsoft.Win32/SessionSwitchEventHandler.cs b/mcs/class/System/Microsoft.Win32/SessionSwitchEventHandler.cs new file mode 100644 index 00000000000..38c9ee8dee7 --- /dev/null +++ b/mcs/class/System/Microsoft.Win32/SessionSwitchEventHandler.cs @@ -0,0 +1,36 @@ +// +// Microsoft.Win32.SessionSwitchEventHandler delegate +// +// Author: +// Sebastien Pouliot <sebastien@ximian.com> +// +// Copyright (C) 2005 Novell, Inc (http://www.novell.com) +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// + +#if NET_2_0 + +namespace Microsoft.Win32 { + + public delegate void SessionSwitchEventHandler (object sender, SessionSwitchEventArgs e); +} + +#endif diff --git a/mcs/class/System/Microsoft.Win32/SessionSwitchReason.cs b/mcs/class/System/Microsoft.Win32/SessionSwitchReason.cs new file mode 100644 index 00000000000..a6888453fdd --- /dev/null +++ b/mcs/class/System/Microsoft.Win32/SessionSwitchReason.cs @@ -0,0 +1,46 @@ +// +// Microsoft.Win32.SessionSwitchReason enumeration +// +// Author: +// Sebastien Pouliot <sebastien@ximian.com> +// +// Copyright (C) 2005 Novell, Inc (http://www.novell.com) +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// + +#if NET_2_0 + +namespace Microsoft.Win32 { + + public enum SessionSwitchReason { + ConsoleConnect, + ConsoleDisconnect, + RemoteConnect, + RemoteDisconnect, + SessionLogon, + SessionLogoff, + SessionLock, + SessionUnlock, + SessionRemoteControl + } +} + +#endif diff --git a/mcs/class/System/Microsoft.Win32/SystemEvents.cs b/mcs/class/System/Microsoft.Win32/SystemEvents.cs index d1ec533fd54..306381cf33c 100644 --- a/mcs/class/System/Microsoft.Win32/SystemEvents.cs +++ b/mcs/class/System/Microsoft.Win32/SystemEvents.cs @@ -7,8 +7,7 @@ // // (C) 2002 Johannes Roith // (C) 2003 Andreas Nahr -// - +// Copyright (C) 2005 Novell, Inc (http://www.novell.com) // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the @@ -31,11 +30,14 @@ // using System; -using System.Timers; using System.Collections; +using System.ComponentModel; +using System.Security.Permissions; +using System.Timers; + +namespace Microsoft.Win32 {
-namespace Microsoft.Win32 -{ + [PermissionSet (SecurityAction.LinkDemand, Unrestricted = true)] public sealed class SystemEvents { private static Hashtable TimerStore = new Hashtable (); @@ -71,7 +73,7 @@ namespace Microsoft.Win32 private static void InternalTimerElapsed (object e, ElapsedEventArgs args) { if (TimerElapsed != null) - TimerElapsed (null, new TimerElapsedEventArgs (new IntPtr(0))); + TimerElapsed (null, new TimerElapsedEventArgs (IntPtr.Zero)); } [MonoTODO] @@ -86,7 +88,13 @@ namespace Microsoft.Win32 add { throw new System.NotImplementedException ();} remove { throw new System.NotImplementedException ();} } - +#if NET_2_0 + [MonoTODO] + public static event EventHandler DisplaySettingsChanging { + add { throw new NotImplementedException (); } + remove { throw new NotImplementedException (); } + } +#endif [MonoTODO] public static event System.EventHandler EventsThreadShutdown { @@ -102,6 +110,11 @@ namespace Microsoft.Win32 } [MonoTODO] +#if NET_2_0 + [Browsable (false)] + [EditorBrowsable (EditorBrowsableState.Never)] + [Obsolete ("")] +#endif public static event System.EventHandler LowMemory { add { throw new System.NotImplementedException ();} @@ -135,7 +148,13 @@ namespace Microsoft.Win32 add { throw new System.NotImplementedException ();} remove { throw new System.NotImplementedException ();} } - +#if NET_2_0 + [MonoTODO] + public static event SessionSwitchEventHandler SessionSwitch { + add { throw new NotImplementedException (); } + remove { throw new NotImplementedException (); } + } +#endif [MonoTODO] public static event System.EventHandler TimeChanged { diff --git a/mcs/class/System/Microsoft.Win32/TimerElapsedEventArgs.cs b/mcs/class/System/Microsoft.Win32/TimerElapsedEventArgs.cs index 099d9d24880..898c1bed223 100644 --- a/mcs/class/System/Microsoft.Win32/TimerElapsedEventArgs.cs +++ b/mcs/class/System/Microsoft.Win32/TimerElapsedEventArgs.cs @@ -6,8 +6,7 @@ // Andreas Nahr (ClassDevelopment@A-SoftTech.com) // // (C) 2002 Johannes Roith -// - +// Copyright (C) 2005 Novell, Inc (http://www.novell.com) // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the @@ -30,9 +29,14 @@ // using System.Runtime.InteropServices; +using System.Security.Permissions; + +namespace Microsoft.Win32 {
-namespace Microsoft.Win32 -{ + // CAS
+ [PermissionSet (SecurityAction.LinkDemand, Unrestricted = true)] + [PermissionSet (SecurityAction.InheritanceDemand, Unrestricted = true)] + // attributes [ComVisible(false)] public class TimerElapsedEventArgs : System.EventArgs { diff --git a/mcs/class/System/Microsoft.Win32/UserPreferenceCategory.cs b/mcs/class/System/Microsoft.Win32/UserPreferenceCategory.cs index 62eadc3f47f..399b688b23a 100644 --- a/mcs/class/System/Microsoft.Win32/UserPreferenceCategory.cs +++ b/mcs/class/System/Microsoft.Win32/UserPreferenceCategory.cs @@ -5,8 +5,7 @@ // Johannes Roith (johannes@jroith.de)
//
// (C) 2002 Johannes Roith
-//
- +// Copyright (C) 2005 Novell, Inc (http://www.novell.com) // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the @@ -27,11 +26,11 @@ // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // + namespace Microsoft.Win32 {
- /// <summary>
- /// </summary>
- public enum UserPreferenceCategory : int {
+ public enum UserPreferenceCategory { +
Accessibility = 1,
Color = 2,
Desktop = 3,
@@ -44,6 +43,9 @@ namespace Microsoft.Win32 { Power = 10,
Screensaver = 11,
Window = 12,
- Locale = 13
- };
+ Locale = 13, +#if NET_2_0 + VisualStyle +#endif
+ }
}
diff --git a/mcs/class/System/Microsoft.Win32/UserPreferenceChangedEventArgs.cs b/mcs/class/System/Microsoft.Win32/UserPreferenceChangedEventArgs.cs index e606fb3c69c..ac26be3233c 100644 --- a/mcs/class/System/Microsoft.Win32/UserPreferenceChangedEventArgs.cs +++ b/mcs/class/System/Microsoft.Win32/UserPreferenceChangedEventArgs.cs @@ -5,8 +5,7 @@ // Johannes Roith (johannes@jroith.de)
//
// (C) 2002 Johannes Roith
-//
- +// Copyright (C) 2005 Novell, Inc (http://www.novell.com) // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the @@ -27,28 +26,25 @@ // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // + +using System.Security.Permissions; + namespace Microsoft.Win32 {
+ + [PermissionSet (SecurityAction.LinkDemand, Unrestricted = true)] + [PermissionSet (SecurityAction.InheritanceDemand, Unrestricted = true)] + public class UserPreferenceChangedEventArgs : System.EventArgs{
- /// <summary>
- /// </summary>
-public class UserPreferenceChangedEventArgs : System.EventArgs{
-
- UserPreferenceCategory mycategory;
+ UserPreferenceCategory mycategory;
- public UserPreferenceChangedEventArgs(UserPreferenceCategory category)
- {
- this.mycategory = category;
- }
+ public UserPreferenceChangedEventArgs (UserPreferenceCategory category)
+ {
+ this.mycategory = category;
+ }
- public UserPreferenceCategory Category {
-
- get{
- return mycategory;
+ public UserPreferenceCategory Category {
+ get { return mycategory; }
}
-
}
-
-}
-
}
diff --git a/mcs/class/System/Microsoft.Win32/UserPreferenceChangingEventArgs.cs b/mcs/class/System/Microsoft.Win32/UserPreferenceChangingEventArgs.cs index 31341cb43d1..72831d20834 100644 --- a/mcs/class/System/Microsoft.Win32/UserPreferenceChangingEventArgs.cs +++ b/mcs/class/System/Microsoft.Win32/UserPreferenceChangingEventArgs.cs @@ -5,8 +5,7 @@ // Johannes Roith (johannes@jroith.de)
//
// (C) 2002 Johannes Roith
-//
- +// Copyright (C) 2005 Novell, Inc (http://www.novell.com) // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the @@ -27,28 +26,24 @@ // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // + +using System.Security.Permissions; + namespace Microsoft.Win32 {
+ + [PermissionSet (SecurityAction.LinkDemand, Unrestricted = true)] + [PermissionSet (SecurityAction.InheritanceDemand, Unrestricted = true)] + public class UserPreferenceChangingEventArgs : System.EventArgs{
- /// <summary>
- /// </summary>
-public class UserPreferenceChangingEventArgs : System.EventArgs{
-
- UserPreferenceCategory mycategory;
-
+ UserPreferenceCategory mycategory;
- public UserPreferenceChangingEventArgs(UserPreferenceCategory category)
- {
- this.mycategory = category;
- }
+ public UserPreferenceChangingEventArgs (UserPreferenceCategory category)
+ {
+ this.mycategory = category;
+ }
- public UserPreferenceCategory Category {
-
- get{
- return mycategory;
+ public UserPreferenceCategory Category {
+ get { return mycategory; }
}
-
}
-
-}
-
}
|