summaryrefslogtreecommitdiff
path: root/src/binder
diff options
context:
space:
mode:
authorSteve MacLean <stmaclea@microsoft.com>2018-12-22 01:28:33 -0500
committerJan Kotas <jkotas@microsoft.com>2018-12-21 22:28:33 -0800
commit0a1374f4f7c2141bf6d8ad74a68dd329afdbee78 (patch)
tree1762be883b2a3db896d05ac0823f33487082f82c /src/binder
parenta6bd70554605b86f87a3a27ee95ef234ae5b919d (diff)
downloadcoreclr-0a1374f4f7c2141bf6d8ad74a68dd329afdbee78.tar.gz
coreclr-0a1374f4f7c2141bf6d8ad74a68dd329afdbee78.tar.bz2
coreclr-0a1374f4f7c2141bf6d8ad74a68dd329afdbee78.zip
Remove dead ICLRPrivBinder methods (#21637)
* Remove dead FindAssemblyBySpec All paths returned E_FAIL * Remove dead BinderFlags * Remove dead VerifyBind
Diffstat (limited to 'src/binder')
-rw-r--r--src/binder/assembly.cpp22
-rw-r--r--src/binder/clrprivbinderassemblyloadcontext.cpp27
-rw-r--r--src/binder/clrprivbindercoreclr.cpp27
-rw-r--r--src/binder/inc/assembly.hpp13
-rw-r--r--src/binder/inc/clrprivbinderassemblyloadcontext.h14
-rw-r--r--src/binder/inc/clrprivbindercoreclr.h14
6 files changed, 0 insertions, 117 deletions
diff --git a/src/binder/assembly.cpp b/src/binder/assembly.cpp
index 8faa00a908..7f7ab2623e 100644
--- a/src/binder/assembly.cpp
+++ b/src/binder/assembly.cpp
@@ -299,33 +299,11 @@ Exit:
return (m_pBinder == NULL) ? E_FAIL : m_pBinder->BindAssemblyByName(pIAssemblyName, ppAssembly);
}
- HRESULT Assembly::FindAssemblyBySpec(
- LPVOID pvAppDomain,
- LPVOID pvAssemblySpec,
- HRESULT * pResult,
- ICLRPrivAssembly ** ppAssembly)
- {
- return (m_pBinder == NULL) ? E_FAIL : m_pBinder->FindAssemblyBySpec(pvAppDomain, pvAssemblySpec, pResult, ppAssembly);
- }
-
- HRESULT Assembly::VerifyBind (
- IAssemblyName * pIAssemblyName,
- ICLRPrivAssembly *pAssembly,
- ICLRPrivAssemblyInfo *pAssemblyInfo)
- {
- return (m_pBinder == NULL) ? E_FAIL : m_pBinder->VerifyBind(pIAssemblyName, pAssembly, pAssemblyInfo);
- }
-
HRESULT Assembly::GetBinderID(UINT_PTR *pBinderId)
{
return (m_pBinder == NULL) ? E_FAIL : m_pBinder->GetBinderID(pBinderId);
}
- HRESULT Assembly::GetBinderFlags(DWORD *pBinderFlags)
- {
- return (m_pBinder == NULL) ? E_FAIL : m_pBinder->GetBinderFlags(pBinderFlags);
- }
-
HRESULT Assembly::GetLoaderAllocator(LPVOID* pLoaderAllocator)
{
return (m_pBinder == NULL) ? E_FAIL : m_pBinder->GetLoaderAllocator(pLoaderAllocator);
diff --git a/src/binder/clrprivbinderassemblyloadcontext.cpp b/src/binder/clrprivbinderassemblyloadcontext.cpp
index e981314b82..5c6ea42b35 100644
--- a/src/binder/clrprivbinderassemblyloadcontext.cpp
+++ b/src/binder/clrprivbinderassemblyloadcontext.cpp
@@ -169,21 +169,6 @@ Exit:;
return hr;
}
-HRESULT CLRPrivBinderAssemblyLoadContext::VerifyBind(IAssemblyName *AssemblyName,
- ICLRPrivAssembly *pAssembly,
- ICLRPrivAssemblyInfo *pAssemblyInfo)
-{
- return E_FAIL;
-}
-
-HRESULT CLRPrivBinderAssemblyLoadContext::GetBinderFlags(DWORD *pBinderFlags)
-{
- if (pBinderFlags == NULL)
- return E_INVALIDARG;
- *pBinderFlags = BINDER_NONE;
- return S_OK;
-}
-
HRESULT CLRPrivBinderAssemblyLoadContext::GetBinderID(
UINT_PTR *pBinderId)
{
@@ -191,18 +176,6 @@ HRESULT CLRPrivBinderAssemblyLoadContext::GetBinderID(
return S_OK;
}
-HRESULT CLRPrivBinderAssemblyLoadContext::FindAssemblyBySpec(
- LPVOID pvAppDomain,
- LPVOID pvAssemblySpec,
- HRESULT *pResult,
- ICLRPrivAssembly **ppAssembly)
-{
- // We are not using a cache at this level
- // However, assemblies bound by the CoreCLR binder is already cached in the
- // AppDomain and will be resolved from there if required
- return E_FAIL;
-}
-
HRESULT CLRPrivBinderAssemblyLoadContext::GetLoaderAllocator(LPVOID* pLoaderAllocator)
{
_ASSERTE(pLoaderAllocator != NULL);
diff --git a/src/binder/clrprivbindercoreclr.cpp b/src/binder/clrprivbindercoreclr.cpp
index eaa0607ad6..eb7abe2125 100644
--- a/src/binder/clrprivbindercoreclr.cpp
+++ b/src/binder/clrprivbindercoreclr.cpp
@@ -181,21 +181,6 @@ Exit:;
}
#endif // !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE)
-HRESULT CLRPrivBinderCoreCLR::VerifyBind(IAssemblyName *AssemblyName,
- ICLRPrivAssembly *pAssembly,
- ICLRPrivAssemblyInfo *pAssemblyInfo)
-{
- return E_FAIL;
-}
-
-HRESULT CLRPrivBinderCoreCLR::GetBinderFlags(DWORD *pBinderFlags)
-{
- if (pBinderFlags == NULL)
- return E_INVALIDARG;
- *pBinderFlags = BINDER_NONE;
- return S_OK;
-}
-
HRESULT CLRPrivBinderCoreCLR::GetBinderID(
UINT_PTR *pBinderId)
{
@@ -203,18 +188,6 @@ HRESULT CLRPrivBinderCoreCLR::GetBinderID(
return S_OK;
}
-HRESULT CLRPrivBinderCoreCLR::FindAssemblyBySpec(
- LPVOID pvAppDomain,
- LPVOID pvAssemblySpec,
- HRESULT *pResult,
- ICLRPrivAssembly **ppAssembly)
-{
- // We are not using a cache at this level
- // However, assemblies bound by the CoreCLR binder is already cached in the
- // AppDomain and will be resolved from there if required
- return E_FAIL;
-}
-
HRESULT CLRPrivBinderCoreCLR::SetupBindingPaths(SString &sTrustedPlatformAssemblies,
SString &sPlatformResourceRoots,
SString &sAppPaths,
diff --git a/src/binder/inc/assembly.hpp b/src/binder/inc/assembly.hpp
index 7071e2eaa0..6729f8dbd2 100644
--- a/src/binder/inc/assembly.hpp
+++ b/src/binder/inc/assembly.hpp
@@ -85,21 +85,8 @@ namespace BINDER_SPACE
DWORD *pdwImageType,
ICLRPrivResource ** ppIResource);
- STDMETHOD(VerifyBind)(
- IAssemblyName * pIAssemblyName,
- ICLRPrivAssembly *pAssembly,
- ICLRPrivAssemblyInfo *pAssemblyInfo);
-
STDMETHOD(GetBinderID)(UINT_PTR *pBinderId);
- STDMETHOD(FindAssemblyBySpec)(
- LPVOID pvAppDomain,
- LPVOID pvAssemblySpec,
- HRESULT * pResult,
- ICLRPrivAssembly ** ppAssembly);
-
- STDMETHOD(GetBinderFlags)(DWORD *pBinderFlags);
-
STDMETHOD(GetLoaderAllocator)(LPVOID* pLoaderAllocator);
// --------------------------------------------------------------------
diff --git a/src/binder/inc/clrprivbinderassemblyloadcontext.h b/src/binder/inc/clrprivbinderassemblyloadcontext.h
index 9f3159f694..f838557c21 100644
--- a/src/binder/inc/clrprivbinderassemblyloadcontext.h
+++ b/src/binder/inc/clrprivbinderassemblyloadcontext.h
@@ -35,23 +35,9 @@ public:
/* [in] */ IAssemblyName *pIAssemblyName,
/* [retval][out] */ ICLRPrivAssembly **ppAssembly);
- STDMETHOD(VerifyBind)(
- /* [in] */ IAssemblyName *pIAssemblyName,
- /* [in] */ ICLRPrivAssembly *pAssembly,
- /* [in] */ ICLRPrivAssemblyInfo *pAssemblyInfo);
-
- STDMETHOD(GetBinderFlags)(
- /* [retval][out] */ DWORD *pBinderFlags);
-
STDMETHOD(GetBinderID)(
/* [retval][out] */ UINT_PTR *pBinderId);
- STDMETHOD(FindAssemblyBySpec)(
- /* [in] */ LPVOID pvAppDomain,
- /* [in] */ LPVOID pvAssemblySpec,
- /* [out] */ HRESULT *pResult,
- /* [out] */ ICLRPrivAssembly **ppAssembly);
-
STDMETHOD(GetLoaderAllocator)(
/* [retval][out] */ LPVOID *pLoaderAllocator);
diff --git a/src/binder/inc/clrprivbindercoreclr.h b/src/binder/inc/clrprivbindercoreclr.h
index e8e26a06c2..178ee1847f 100644
--- a/src/binder/inc/clrprivbindercoreclr.h
+++ b/src/binder/inc/clrprivbindercoreclr.h
@@ -25,23 +25,9 @@ public:
/* [in] */ IAssemblyName *pIAssemblyName,
/* [retval][out] */ ICLRPrivAssembly **ppAssembly);
- STDMETHOD(VerifyBind)(
- /* [in] */ IAssemblyName *pIAssemblyName,
- /* [in] */ ICLRPrivAssembly *pAssembly,
- /* [in] */ ICLRPrivAssemblyInfo *pAssemblyInfo);
-
- STDMETHOD(GetBinderFlags)(
- /* [retval][out] */ DWORD *pBinderFlags);
-
STDMETHOD(GetBinderID)(
/* [retval][out] */ UINT_PTR *pBinderId);
- STDMETHOD(FindAssemblyBySpec)(
- /* [in] */ LPVOID pvAppDomain,
- /* [in] */ LPVOID pvAssemblySpec,
- /* [out] */ HRESULT *pResult,
- /* [out] */ ICLRPrivAssembly **ppAssembly);
-
STDMETHOD(GetLoaderAllocator)(
/* [retval][out] */ LPVOID *pLoaderAllocator);