Imported Upstream version 4.2.0.179

Former-commit-id: 0a113cb3a6feb7873f632839b1307cc6033cd595
This commit is contained in:
Xamarin Public Jenkins
2015-08-26 07:17:56 -04:00
committed by Jo Shields
parent 183bba2c9a
commit 6992685b86
7507 changed files with 90259 additions and 657307 deletions

View File

@@ -1 +1 @@
71092075d227694f12a3b1b21c6ca70412849015
f8880b5d09ba0af05986f7f82be2593ae8caf155

View File

@@ -15,6 +15,7 @@ namespace System.Data.Common {
internal static class NativeMethods {
#if !NO_OLEDB
[Guid("0c733a1e-2a1c-11ce-ade5-00aa0044773d"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown), ComImport]
internal interface ISourcesRowset {
@@ -25,6 +26,7 @@ namespace System.Data.Common {
[In] IntPtr rgProperties,
[Out, MarshalAs(UnmanagedType.Interface)] out object ppRowset);
}
#endif
[Guid("0C733A5E-2A1C-11CE-ADE5-00AA0044773D"), InterfaceTypeAttribute(ComInterfaceType.InterfaceIsIUnknown), ComImport]
internal interface ITransactionJoin {

View File

@@ -290,7 +290,7 @@ internal static partial class Bid
}
}
#if !NO_ODBC
//
// Manually edited wrappers
//
@@ -311,7 +311,9 @@ internal static partial class Bid
if (((System.Data.Odbc.ODBC32.RetCode.SUCCESS != a1) || (modFlags & ApiGroup.StatusOk) != 0) && (modFlags & ApiGroup.Trace) != 0 && modID != NoData)
NativeMethods.Trace (modID, UIntPtr.Zero, UIntPtr.Zero, fmtPrintfW, (int)(short)a1, a2);
}
#endif
#if !NO_OLEDB
[BidMethod]
[ReliabilityContract(Consistency.WillNotCorruptState, Cer.Success)]
internal static void Trace(string fmtPrintfW, System.Data.OleDb.OleDbHResult a1) { //
@@ -336,7 +338,7 @@ internal static partial class Bid
if ((modFlags & ApiGroup.Trace) != 0 && modID != NoData)
NativeMethods.Trace (modID, UIntPtr.Zero, UIntPtr.Zero, fmtPrintfW, (int)a1,a2);
}
#endif
[BidMethod]
internal static void Trace(string fmtPrintfW, System.String a1, System.String a2) {

View File

@@ -8,7 +8,9 @@
//------------------------------------------------------------------------------
using System;
#if !NO_ODBC
using System.Data.Odbc;
#endif
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Security;
@@ -22,6 +24,7 @@ namespace System.Data.Common {
[SuppressUnmanagedCodeSecurityAttribute()]
internal static class UnsafeNativeMethods {
#if !NO_ODBC
//
// ODBC32
//
@@ -462,7 +465,9 @@ namespace System.Data.Common {
[In, MarshalAs(UnmanagedType.LPWStr)]
/*SQLCHAR* */string TableType,
/*SQLSMALLINT*/Int16 NameLen4);
#endif
#if !NO_OLEDB
//
// Oleaut32
//
@@ -1222,6 +1227,7 @@ namespace System.Data.Common {
IntPtr pUnkOuter,
ref Guid riid,
[MarshalAs(UnmanagedType.Interface)] ref object ppCommand);
#endif
//
// Advapi32.dll Integrated security functions