Changes relating to post 4

Author: debugthings

ALL_BUILD.vcxproj

@@ -0,0 +1,12 @@
+LIBRARY		MySQLDotNet
+VERSION		1.0
+EXPORTS
+  mysqldotnet_int_deinit
+  mysqldotnet_int_init
+  mysqldotnet_int
+  mysqldotnet_real_deinit
+  mysqldotnet_real_init
+  mysqldotnet_real
+  mysqldotnet_string_deinit
+  mysqldotnet_string_init
+  mysqldotnet_string

ALL_BUILD.vcxproj.filters

@@ -1,8 +1,8 @@
 
 #include "ClrHost.h"
 
-const wchar_t *CClrHost::AppDomainManagerAssembly = L"mysql_managed_interface, Version=1.0.0.0, PublicKeyToken=71c4a5d4270bd29c";
-const wchar_t *CClrHost::AppDomainManagerType = L"mysql_managed_interface.MySQLHostManager";
+const wchar_t *CClrHost::AppDomainManagerAssembly = L"MySQLHostManager, Version=1.0.0.0, PublicKeyToken=71c4a5d4270bd29c";
+const wchar_t *CClrHost::AppDomainManagerType = L"MySQLHostManager.MySQLHostManager";
 
 bool g_CLRHasBeenLoaded = false;
 
@@ -286,15 +286,41 @@ STDMETHODIMP CClrHost::raw_GetManagedHost(long appDomain, BSTR clr, IManagedHost
 	}
 }
 
+STDMETHODIMP CClrHost::raw_GetSpecificManagedHost(BSTR clr, IManagedHost **ppHost)
+{
+	_ASSERTE(m_started);
+
+	if (ppHost == NULL)
+		return E_POINTER;
+
+	// get the AppDomainManager for the specified domain
+	auto iHost = m_NewlyCreatedAppDomains[clr];
+
+	// see if we've got a host
+	if (iHost == NULL)
+	{
+		*ppHost = NULL;
+		return E_NOMANAGEDHOST;
+	}
+	else
+	{
+		*ppHost = iHost;
+		(*ppHost)->AddRef();
+		return S_OK;
+	}
+}
+
+
 // IHostGCManager
 STDMETHODIMP CClrHost::SuspensionEnding(DWORD generation){ return S_OK; }
 STDMETHODIMP CClrHost::SuspensionStarting(){ return S_OK; }
 STDMETHODIMP CClrHost::ThreadIsBlockingForSuspension(){ return S_OK; }
 
-std::wstring CClrHost::CreateAppDomainForQuery(std::string FnName)
+STDMETHODIMP CClrHost::raw_CreateAppDomainForQuery(BSTR FnName, BSTR *pRetVal)
 {
 	IManagedHostPtr pAppMgr = this->GetDefaultManagedHost();
-	_bstr_t retString = pAppMgr->CreateAppDomain(_bstr_t(FnName.c_str()));
-
+	IManagedHostPtr pNewDomain = pAppMgr->CreateAppDomain(FnName);
+	*pRetVal = (BSTR)pNewDomain->GetAppDomainName;
+	this->m_NewlyCreatedAppDomains[std::wstring(*pRetVal)] = pNewDomain;
 	return S_OK;
 }

MySQLDotNet.def

@@ -45,7 +45,7 @@ class ATL_NO_VTABLE CClrHost : public CComObjectRootEx<CComSingleThreadModel>,
 
 public:
 	static HRESULT BindToRuntime(IUnmanagedHost **pHost);
-	std::wstring CreateAppDomainForQuery(std::string FnName);
+	
 
 	// IHostControl
 public:
@@ -58,6 +58,8 @@ class ATL_NO_VTABLE CClrHost : public CComObjectRootEx<CComSingleThreadModel>,
 	STDMETHODIMP raw_Stop();
 	STDMETHODIMP get_DefaultManagedHost(IManagedHost **ppHost);
 	STDMETHODIMP raw_GetManagedHost(long appDomain, BSTR clr, IManagedHost **ppHost);
+	STDMETHODIMP raw_GetSpecificManagedHost(BSTR clr, IManagedHost **ppHost);
+	STDMETHODIMP raw_CreateAppDomainForQuery(BSTR FnName, BSTR * pRetVal);
 
 	// IHostGCManager
 public:

ZERO_CHECK.vcxproj

@@ -64,7 +64,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
     <PreBuildEvent>
-      <Command>"$(TargetFrameworkSDKToolsDirectory)TlbExp.exe" "$(SolutionDir)mysql_managed_interface\bin\$(Configuration)\mysql_managed_interface.dll" /out:"$(IntDir)mysql_managed_interface.tlb"</Command>
+      <Command>"$(TargetFrameworkSDKToolsDirectory)TlbExp.exe" "$(SolutionDir)mysql_managed_interface\bin\$(Configuration)\MySQLHostManager.dll" /out:"$(IntDir)MySQLHostManager.tlb"</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

ZERO_CHECK.vcxproj.filters

@@ -26,15 +26,16 @@
 #include "resource.h"
 #include <iostream>
 #include <map>
+#include <string>
 #include <atlbase.h>
 #include <atlcom.h>
 #include <comdef.h>
 #include <tchar.h>
 #include <mscoree.h>
 #ifdef DEBUG
-#import "Debug/mysql_managed_interface.tlb" no_namespace
+#import "Debug/MySQLHostManager.tlb" no_namespace
 #else
-#import "Release/mysql_managed_interface.tlb" no_namespace
+#import "Release/MySQLHostManager.tlb" no_namespace
 #endif
 
 #pragma warning (pop)

clr_host/ClrHost.cpp

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace mysql_managed_interface
+namespace MySQLHostManager
 {
     public interface ICustomAssembly
     {