You've already forked linux-packaging-mono
Imported Upstream version 4.3.2.467
Former-commit-id: 9c2cb47f45fa221e661ab616387c9cda183f283d
This commit is contained in:
@@ -309,7 +309,9 @@ namespace System.Runtime.Diagnostics
|
||||
{
|
||||
currentDomain.UnhandledException += new UnhandledExceptionEventHandler(UnhandledExceptionHandler);
|
||||
this.SetLevel(this.TraceSource.Switch.Level);
|
||||
#if MONO_FEATURE_MULTIPLE_APPDOMAINS
|
||||
currentDomain.DomainUnload += new EventHandler(ExitOrUnloadEventHandler);
|
||||
#endif
|
||||
currentDomain.ProcessExit += new EventHandler(ExitOrUnloadEventHandler);
|
||||
}
|
||||
}
|
||||
|
@@ -23,4 +23,4 @@ namespace System.Runtime.Diagnostics
|
||||
ListenerAdapter
|
||||
}
|
||||
|
||||
}
|
||||
}
|
@@ -18,7 +18,7 @@ namespace System.Runtime.Diagnostics
|
||||
// The Severity and Facility assigned in EventLog.mc must match those assigned via the EventId here.
|
||||
// If the EventId's do not match, the EventViewer will not be able to display the strings defined in EventLog.mc correctly. In this case, the following error message will be included in the logged event:
|
||||
// "The description for Event ID XX from source System.ServiceModel 4.0.0.0 cannot be found..."
|
||||
// To inspect the value ----igend to the enum elements below, build 'ndp\cdf\src\System.ServiceModel.Internals', and inspect System.ServiceModel.Internals\System.ServiceModel.Internals.asmmeta
|
||||
// To inspect the value assigend to the enum elements below, build 'ndp\cdf\src\System.ServiceModel.Internals', and inspect System.ServiceModel.Internals\System.ServiceModel.Internals.asmmeta
|
||||
// To inspect the EventId generated from EventLog.mc, build 'ndp\cdf\src\WCF\EventLog', and open ServiceModelEvents.dll.mui with \\indigofs\PrivateLabDebugShare\sarada\RPFRecorder\RPFRecorder.exe (convert EventId from decimal to hex).
|
||||
// You could also use any other method of viewing ServiceModelEvents.dll.mui which would allow you to inspect the EventId
|
||||
enum EventLogEventId : uint
|
||||
|
@@ -13,6 +13,7 @@ namespace System.Runtime.Interop
|
||||
using System.Runtime.InteropServices;
|
||||
using System.Diagnostics.CodeAnalysis;
|
||||
using System.Runtime.Diagnostics;
|
||||
using FILETIME = System.Runtime.InteropServices.ComTypes.FILETIME;
|
||||
|
||||
[SuppressUnmanagedCodeSecurity]
|
||||
static class UnsafeNativeMethods
|
||||
@@ -34,7 +35,7 @@ namespace System.Runtime.Interop
|
||||
internal uint Size;
|
||||
[FieldOffset(12)]
|
||||
internal int Reserved;
|
||||
}
|
||||
}
|
||||
|
||||
[SuppressMessage(FxCop.Category.Security, FxCop.Rule.ReviewSuppressUnmanagedCodeSecurityUsage,
|
||||
Justification = "This PInvoke call has been reviewed")]
|
||||
@@ -73,7 +74,17 @@ namespace System.Runtime.Interop
|
||||
[DllImport(KERNEL32, SetLastError = true)]
|
||||
[ResourceExposure(ResourceScope.None)]
|
||||
[SecurityCritical]
|
||||
public static extern void GetSystemTimeAsFileTime([Out] out long time);
|
||||
private static extern void GetSystemTimeAsFileTime([Out] out FILETIME time);
|
||||
|
||||
[SecurityCritical]
|
||||
public static void GetSystemTimeAsFileTime(out long time) {
|
||||
FILETIME fileTime;
|
||||
GetSystemTimeAsFileTime(out fileTime);
|
||||
time = 0;
|
||||
time |= (uint)fileTime.dwHighDateTime;
|
||||
time <<= sizeof(uint) * 8;
|
||||
time |= (uint)fileTime.dwLowDateTime;
|
||||
}
|
||||
|
||||
[SuppressMessage(FxCop.Category.Security, FxCop.Rule.SpecifyMarshalingForPInvokeStringArguments, Justification = "")]
|
||||
[DllImport(KERNEL32, SetLastError = true, CharSet = CharSet.Auto)]
|
||||
|
Reference in New Issue
Block a user