Imported Upstream version 4.2.0.179

Former-commit-id: 4610231f55806d2a05ed69e5ff3faa7336cc1479
This commit is contained in:
Xamarin Public Jenkins
2015-08-26 07:17:56 -04:00
committed by Jo Shields
parent aa7da660d6
commit c042cd0c52
7507 changed files with 90259 additions and 657307 deletions

View File

@@ -877,7 +877,9 @@ internal static partial class Bid
[ResourceConsumption(ResourceScope.Machine, ResourceScope.Machine)] // getModulePath
private static void initEntryPoint()
{
#if !MONO
NativeMethods.DllBidInitialize();
#endif
//
// Multi-file assemblies are not supported by current model of the BID managed wrapper.
@@ -890,6 +892,7 @@ internal static partial class Bid
modID = NoData;
string friendlyName = getAppDomainFriendlyName();
#if !MONO
BIDEXTINFO extInfo = new BIDEXTINFO(Marshal.GetHINSTANCE(mod),
getModulePath(mod),
friendlyName,
@@ -898,6 +901,7 @@ internal static partial class Bid
NativeMethods.DllBidEntryPoint( ref modID, BidVer, modIdentity,
configFlags, ref modFlags, ctrlCallback,
ref extInfo, IntPtr.Zero, IntPtr.Zero );
#endif
if( modID != NoData )
{