Some cleanups in Assembly/Loader area

src/coreclr/binder/CMakeLists.txt

@@ -6,12 +6,11 @@ include_directories(BEFORE "inc")
 set(BINDER_COMMON_SOURCES
     applicationcontext.cpp
     assembly.cpp
-    assemblybinder.cpp
+    assemblybindercommon.cpp
     assemblyidentitycache.cpp
     assemblyname.cpp
     bindertracing.cpp
-    clrprivbindercoreclr.cpp
-    coreclrbindercommon.cpp
+    defaultassemblybinder.cpp
     failurecache.cpp
     stringlexer.cpp
     textualidentityparser.cpp
@@ -23,7 +22,7 @@ set(BINDER_COMMON_HEADERS
     inc/applicationcontext.inl
     inc/assembly.hpp
     inc/assembly.inl
-    inc/assemblybinder.hpp
+    inc/assemblybindercommon.hpp
     inc/assemblyentry.hpp
     inc/assemblyhashtraits.hpp
     inc/assemblyidentity.hpp
@@ -36,8 +35,7 @@ set(BINDER_COMMON_HEADERS
     inc/bindertracing.h
     inc/bindresult.hpp
     inc/bindresult.inl
-    inc/clrprivbindercoreclr.h
-    inc/coreclrbindercommon.h
+    inc/defaultassemblybinder.h
     inc/failurecache.hpp
     inc/failurecachehashtraits.hpp
     inc/loadcontext.hpp
@@ -51,13 +49,13 @@ set(BINDER_COMMON_HEADERS
 set(BINDER_SOURCES
     ${BINDER_COMMON_SOURCES}
     activitytracker.cpp
-    clrprivbinderassemblyloadcontext.cpp
+    customassemblybinder.cpp
 )
 
 set(BINDER_HEADERS
     ${BINDER_COMMON_HEADERS}
     inc/activitytracker.h
-    inc/clrprivbinderassemblyloadcontext.h
+    inc/customassemblybinder.h
     inc/contextentry.hpp
 )
 

src/coreclr/binder/applicationcontext.cpp

@@ -23,63 +23,17 @@ using namespace clr::fs;
 
 namespace BINDER_SPACE
 {
-    STDMETHODIMP ApplicationContext::QueryInterface(REFIID   riid,
-                                                    void   **ppv)
-    {
-        HRESULT hr = S_OK;
-
-        if (ppv == NULL)
-        {
-            hr = E_POINTER;
-        }
-        else
-        {
-            if (IsEqualIID(riid, IID_IUnknown))
-            {
-                AddRef();
-                *ppv = static_cast<IUnknown *>(this);
-            }
-            else
-            {
-                *ppv = NULL;
-                hr = E_NOINTERFACE;
-            }
-        }
-
-        return hr;
-    }
-
-    STDMETHODIMP_(ULONG) ApplicationContext::AddRef()
-    {
-        return InterlockedIncrement(&m_cRef);
-    }
-
-    STDMETHODIMP_(ULONG) ApplicationContext::Release()
-    {
-        ULONG ulRef = InterlockedDecrement(&m_cRef);
-
-        if (ulRef == 0)
-        {
-            delete this;
-        }
-
-        return ulRef;
-    }
-
     ApplicationContext::ApplicationContext()
     {
-        m_cRef = 1;
-        m_dwAppDomainId = 0;
         m_pExecutionContext = NULL;
         m_pFailureCache = NULL;
         m_contextCS = NULL;
         m_pTrustedPlatformAssemblyMap = nullptr;
-        m_binderID = 0;
     }
 
     ApplicationContext::~ApplicationContext()
     {
-        SAFE_RELEASE(m_pExecutionContext);
+        SAFE_DELETE(m_pExecutionContext);
         SAFE_DELETE(m_pFailureCache);
 
         if (m_contextCS != NULL)
@@ -93,11 +47,11 @@ namespace BINDER_SPACE
         }
     }
 
-    HRESULT ApplicationContext::Init(UINT_PTR binderID)
+    HRESULT ApplicationContext::Init()
     {
         HRESULT hr = S_OK;
 
-        ReleaseHolder<ExecutionContext> pExecutionContext;
+        NewHolder<ExecutionContext> pExecutionContext;
 
         FailureCache *pFailureCache = NULL;
 
@@ -121,7 +75,6 @@ namespace BINDER_SPACE
             m_pFailureCache = pFailureCache;
         }
 
-        m_binderID = binderID;
     Exit:
         return hr;
     }

src/coreclr/binder/assembly.cpp

@@ -24,49 +24,6 @@ namespace BINDER_SPACE
         }
     };
 
-    STDMETHODIMP Assembly::QueryInterface(REFIID   riid,
-                                          void   **ppv)
-    {
-        HRESULT hr = S_OK;
-
-        if (ppv == NULL)
-        {
-            hr = E_POINTER;
-        }
-        else
-        {
-            if (IsEqualIID(riid, IID_IUnknown))
-            {
-                AddRef();
-                *ppv = static_cast<IUnknown *>(this);
-            }
-            else
-            {
-                *ppv = NULL;
-                hr = E_NOINTERFACE;
-            }
-        }
-
-        return hr;
-    }
-
-    STDMETHODIMP_(ULONG) Assembly::AddRef()
-    {
-        return InterlockedIncrement(&m_cRef);
-    }
-
-    STDMETHODIMP_(ULONG) Assembly::Release()
-    {
-        ULONG ulRef = InterlockedDecrement(&m_cRef);
-
-        if (ulRef == 0)
-        {
-            delete this;
-        }
-
-        return ulRef;
-    }
-
     Assembly::Assembly()
     {
         m_cRef = 1;
@@ -103,7 +60,7 @@ namespace BINDER_SPACE
                            PEImage                 *pPEImage,
                            PEImage                 *pNativePEImage,
                            SString                 &assemblyPath,
-                           BOOL                     fIsInGAC)
+                           BOOL                     fIsInTPA)
     {
         HRESULT hr = S_OK;
 
@@ -113,15 +70,15 @@ namespace BINDER_SPACE
         // Get assembly name def from meta data import and store it for later refs access
         IF_FAIL_GO(pAssemblyName->Init(pIMetaDataAssemblyImport, PeKind));
         SetMDImport(pIMetaDataAssemblyImport);
-        if (!fIsInGAC)
+        if (!fIsInTPA)
         {
             GetPath().Set(assemblyPath);
         }
 
         // Safe architecture for validation
         PEKIND kAssemblyArchitecture;
         kAssemblyArchitecture = pAssemblyName->GetArchitecture();
-        SetIsInGAC(fIsInGAC);
+        SetIsInTPA(fIsInTPA);
         SetPEImage(pPEImage);
         SetNativePEImage(pNativePEImage);
         pAssemblyName->SetIsDefinition(TRUE);
@@ -174,40 +131,17 @@ namespace BINDER_SPACE
     }
 
     // --------------------------------------------------------------------
-    // ICLRPrivAssembly methods
+    // BINDER_SPACE::Assembly methods
     // --------------------------------------------------------------------
     LPCWSTR Assembly::GetSimpleName()
     {
         AssemblyName *pAsmName = GetAssemblyName();
         return (pAsmName == nullptr ? nullptr : (LPCWSTR)pAsmName->GetSimpleName());
     }
 
-    HRESULT Assembly::BindAssemblyByName(AssemblyNameData *pAssemblyNameData, ICLRPrivAssembly ** ppAssembly)
-    {
-        return (m_pBinder == NULL) ? E_FAIL : m_pBinder->BindAssemblyByName(pAssemblyNameData, ppAssembly);
-    }
-
-    HRESULT Assembly::GetBinderID(UINT_PTR *pBinderId)
-    {
-        return (m_pBinder == NULL) ? E_FAIL : m_pBinder->GetBinderID(pBinderId);
-    }
-
-    HRESULT Assembly::GetLoaderAllocator(LPVOID* pLoaderAllocator)
-    {
-        return (m_pBinder == NULL) ? E_FAIL : m_pBinder->GetLoaderAllocator(pLoaderAllocator);
-    }
-
-    HRESULT Assembly::GetAvailableImageTypes(
-        LPDWORD pdwImageTypes)
+    AssemblyLoaderAllocator* Assembly::GetLoaderAllocator()
     {
-        HRESULT hr = E_FAIL;
-
-        if(pdwImageTypes == nullptr)
-            return E_INVALIDARG;
-
-        *pdwImageTypes = ASSEMBLY_IMAGE_TYPE_ASSEMBLY;
-
-        return S_OK;
+        return m_pBinder ? m_pBinder->GetLoaderAllocator() : NULL;
     }
 }