You've already forked linux-packaging-mono
Imported Upstream version 4.8.0.309
Former-commit-id: 5f9c6ae75f295e057a7d2971f3a6df4656fa8850
This commit is contained in:
parent
ee1447783b
commit
94b2861243
@@ -151,7 +151,13 @@ namespace System.Runtime.InteropServices {
|
||||
}
|
||||
}
|
||||
|
||||
#if FEATURE_COMINTEROP && !MONO
|
||||
#if FEATURE_COMINTEROP || MONO
|
||||
#if MONO
|
||||
private static IntPtr GetRuntimeInterfaceImpl(Guid clsid, Guid riid)
|
||||
{
|
||||
throw new NotSupportedException();
|
||||
}
|
||||
#else
|
||||
[System.Security.SecurityCritical]
|
||||
[ResourceExposure(ResourceScope.Process)]
|
||||
[ResourceConsumption(ResourceScope.Process)]
|
||||
@@ -160,6 +166,7 @@ namespace System.Runtime.InteropServices {
|
||||
private static extern IntPtr GetRuntimeInterfaceImpl(
|
||||
[In, MarshalAs(UnmanagedType.LPStruct)] Guid clsid,
|
||||
[In, MarshalAs(UnmanagedType.LPStruct)] Guid riid);
|
||||
#endif
|
||||
|
||||
//
|
||||
// This function does the equivalent of calling GetInterface(clsid, riid) on the
|
||||
|
||||
@@ -28,22 +28,26 @@ namespace System.Runtime.InteropServices.WindowsRuntime
|
||||
[DllImport("api-ms-win-core-winrt-error-l1-1-1.dll", PreserveSig = false)]
|
||||
[SecurityCritical]
|
||||
[SuppressUnmanagedCodeSecurity]
|
||||
[DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
|
||||
internal static extern IRestrictedErrorInfo GetRestrictedErrorInfo();
|
||||
|
||||
[DllImport("api-ms-win-core-winrt-error-l1-1-1.dll")]
|
||||
[SecurityCritical]
|
||||
[SuppressUnmanagedCodeSecurity]
|
||||
[return: MarshalAs(UnmanagedType.Bool)]
|
||||
[DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
|
||||
internal static extern bool RoOriginateLanguageException(int error, [MarshalAs(UnmanagedType.HString)]string message, IntPtr languageException);
|
||||
|
||||
[DllImport("api-ms-win-core-winrt-error-l1-1-1.dll", PreserveSig = false)]
|
||||
[SecurityCritical]
|
||||
[SuppressUnmanagedCodeSecurity]
|
||||
[DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
|
||||
internal static extern void RoReportUnhandledError(IRestrictedErrorInfo error);
|
||||
|
||||
[DllImport("api-ms-win-core-winrt-string-l1-1-0.dll", CallingConvention = CallingConvention.StdCall)]
|
||||
[SecurityCritical]
|
||||
[SuppressUnmanagedCodeSecurity]
|
||||
[DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
|
||||
internal static unsafe extern int WindowsCreateString([MarshalAs(UnmanagedType.LPWStr)] string sourceString,
|
||||
int length,
|
||||
[Out] IntPtr *hstring);
|
||||
@@ -51,6 +55,7 @@ namespace System.Runtime.InteropServices.WindowsRuntime
|
||||
[DllImport("api-ms-win-core-winrt-string-l1-1-0.dll", CallingConvention = CallingConvention.StdCall)]
|
||||
[SecurityCritical]
|
||||
[SuppressUnmanagedCodeSecurity]
|
||||
[DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
|
||||
internal static unsafe extern int WindowsCreateStringReference(char *sourceString,
|
||||
int length,
|
||||
[Out] HSTRING_HEADER *hstringHeader,
|
||||
@@ -59,11 +64,13 @@ namespace System.Runtime.InteropServices.WindowsRuntime
|
||||
[DllImport("api-ms-win-core-winrt-string-l1-1-0.dll", CallingConvention = CallingConvention.StdCall)]
|
||||
[SecurityCritical]
|
||||
[SuppressUnmanagedCodeSecurity]
|
||||
[DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
|
||||
internal static extern int WindowsDeleteString(IntPtr hstring);
|
||||
|
||||
[DllImport("api-ms-win-core-winrt-string-l1-1-0.dll", CallingConvention = CallingConvention.StdCall)]
|
||||
[SecurityCritical]
|
||||
[SuppressUnmanagedCodeSecurity]
|
||||
[DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
|
||||
internal static unsafe extern char* WindowsGetStringRawBuffer(IntPtr hstring, [Out] uint *length);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -34,7 +34,7 @@ namespace System.Runtime.Serialization.Formatters.Binary {
|
||||
|
||||
[System.Runtime.InteropServices.ComVisible(true)]
|
||||
sealed public class BinaryFormatter :
|
||||
#if !FEATURE_REMOTING
|
||||
#if !FEATURE_REMOTING && !MONO
|
||||
IFormatter
|
||||
#else
|
||||
IRemotingFormatter
|
||||
|
||||
Reference in New Issue
Block a user